On Wed, 2016-12-14 at 15:02 +0100, Bernd Schmidt wrote: > On 12/09/2016 08:32 PM, David Malcolm wrote: > > Thanks. Unfortunately, applying the "locate_file" patch > > https://gcc.gnu.org/ml/gcc-patches/2016-11/msg01186.html > > would now introduce a regression in a recently-added test case: > > > The problem is that this DejaGnu test case uses -fself-test, and > > doesn't provide any arguments. With the locate_file patch, we need > > to > > pass the path to $(srcdir)/testsuite/selftests as an argument to > > -fself > > -test, and it's not clear to me how to do that sanely in a DejaGnu > > test > > case; if I pass in a dummy value (like for pr71591.c), then the > > selftests that use locate_file fail. > > I think this part of the selftest framework (how to locate files and > tests) is possibly going to need some rethinking. But for now, I'm ok > with just adding dg-skip-if *-*-* to the problematic testcase, with a > comment describing the situation. > > > Bernd
Thanks. I've committed the following updated version to trunk (as r243681). Changed in v5: * disable DejaGnu test for PR 78213 Successfully bootstrapped®rtested on x86_64-pc-linux-gnu (with 2 PASS results converted to 1 UNSUPPORTED in gcc.sum, re gcc.dg/pr78213.c). Verified absence of regressions under "make selftest-valgrind". Successfully tested stage1 of the build (and s-selftest) on powerpc-ibm-aix7.1.3.0 (gcc111). FWIW, the last known remaining issues with the RTL frontend are: * dumping of non-virtual pseudos (see https://gcc.gnu.org/ml/gcc-patches/2016-12/msg01302.html) * review of patch 9 of the kit ("__RTL" within cc1) (see https://gcc.gnu.org/ml/gcc-patches/2016-12/msg00151.html) gcc/ChangeLog: * Makefile.in (SELFTEST_FLAGS): Add path argument to -fself-test. (s-selftest): Add dependency on the selftests data directory. * common.opt (fself-test): Rename to... (fself-test=): ...this, documenting the meaning of the argument. * selftest-run-tests.c (along): Likewise. * selftest-run-tests.c: Include "options.h". (selftest::run_tests): Initialize selftest::path_to_selftest_files from flag_self_test. * selftest.c (selftest::path_to_selftest_files): New global. (selftest::locate_file): New function. (selftest::test_locate_file): New function. (selftest_c_tests): Likewise. (selftest::selftest_c_tests): Call test_locate_file. * selftest.h (selftest::locate_file): New decl. (selftest::path_to_selftest_files): New decl. gcc/testsuite/ChangeLog: PR target/78213 * gcc.dg/cpp/pr71591.c: Add a fake value for the argument of -fself-test. * gcc.dg/pr78213.c: Disable this test. * selftests/example.txt: New file. --- gcc/Makefile.in | 10 +++++++--- gcc/common.opt | 6 +++--- gcc/selftest-run-tests.c | 8 ++++++++ gcc/selftest.c | 28 ++++++++++++++++++++++++++++ gcc/selftest.h | 10 ++++++++++ gcc/testsuite/gcc.dg/cpp/pr71591.c | 2 +- gcc/testsuite/gcc.dg/pr78213.c | 7 +++++++ gcc/testsuite/selftests/example.txt | 1 + 8 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/selftests/example.txt diff --git a/gcc/Makefile.in b/gcc/Makefile.in index c7b1eaf..aaf742e 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1892,15 +1892,19 @@ rest.cross: specs # Specify -o /dev/null so the output of -S is discarded. More importantly # It does not try to create a file with the name "null.s" on POSIX and # "nul.s" on Windows. Because on Windows "nul" is a reserved file name. -SELFTEST_FLAGS = -nostdinc -x c /dev/null -S -fself-test -o /dev/null +# Specify the path to gcc/testsuite/selftests within the srcdir +# as an argument to -fself-test. +SELFTEST_FLAGS = -nostdinc -x c /dev/null -S -o /dev/null \ + -fself-test=$(srcdir)/testsuite/selftests # Run the selftests during the build once we have a driver and a cc1, # so that self-test failures are caught as early as possible. # Use "s-selftest" to ensure that we only run the selftests if the -# driver or cc1 change. +# driver, cc1, or selftest data change. .PHONY: selftest selftest: s-selftest -s-selftest: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs +s-selftest: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs \ + $(srcdir)/testsuite/selftests $(GCC_FOR_TARGET) $(SELFTEST_FLAGS) $(STAMP) $@ diff --git a/gcc/common.opt b/gcc/common.opt index b350b07..de06844 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -2152,9 +2152,9 @@ fselective-scheduling2 Common Report Var(flag_selective_scheduling2) Optimization Run selective scheduling after reload. -fself-test -Common Undocumented Var(flag_self_test) -Run self-tests. +fself-test= +Common Undocumented Joined Var(flag_self_test) +Run self-tests, using the given path to locate test files. fsel-sched-pipelining Common Report Var(flag_sel_sched_pipelining) Init(0) Optimization diff --git a/gcc/selftest-run-tests.c b/gcc/selftest-run-tests.c index a4cdb55..c1cd97e 100644 --- a/gcc/selftest-run-tests.c +++ b/gcc/selftest-run-tests.c @@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "target.h" #include "langhooks.h" +#include "options.h" /* This function needed to be split out from selftest.c as it references tests from the whole source tree, and so is within @@ -38,6 +39,13 @@ along with GCC; see the file COPYING3. If not see void selftest::run_tests () { + /* Makefile.in has -fself-test=$(srcdir)/testsuite/selftests, so that + flag_self_test contains the path to the selftest subdirectory of the + source tree (without a trailing slash). Copy it up to + path_to_selftest_files, to avoid selftest.c depending on + option-handling. */ + path_to_selftest_files = flag_self_test; + long start_time = get_run_time (); /* Run all the tests, in hand-coded order of (approximate) dependencies: diff --git a/gcc/selftest.c b/gcc/selftest.c index 40c6cb5..3ff3b3d 100644 --- a/gcc/selftest.c +++ b/gcc/selftest.c @@ -198,6 +198,21 @@ read_file (const location &loc, const char *path) return result; } +/* The path of SRCDIR/testsuite/selftests. */ + +const char *path_to_selftest_files = NULL; + +/* Convert a path relative to SRCDIR/testsuite/selftests + to a real path (either absolute, or relative to pwd). + The result should be freed by the caller. */ + +char * +locate_file (const char *name) +{ + ASSERT_NE (NULL, path_to_selftest_files); + return concat (path_to_selftest_files, "/", name, NULL); +} + /* Selftests for libiberty. */ /* Verify that xstrndup generates EXPECTED when called on SRC and N. */ @@ -281,6 +296,18 @@ test_read_file () free (buf); } +/* Verify locate_file (and read_file). */ + +static void +test_locate_file () +{ + char *path = locate_file ("example.txt"); + char *buf = read_file (SELFTEST_LOCATION, path); + ASSERT_STREQ ("example of a selftest file\n", buf); + free (buf); + free (path); +} + /* Run all of the selftests within this file. */ void @@ -290,6 +317,7 @@ selftest_c_tests () test_assertions (); test_named_temp_file (); test_read_file (); + test_locate_file (); } } // namespace selftest diff --git a/gcc/selftest.h b/gcc/selftest.h index dcce474..c390873 100644 --- a/gcc/selftest.h +++ b/gcc/selftest.h @@ -158,6 +158,16 @@ extern char *read_file (const location &loc, const char *path); extern void forcibly_ggc_collect (); +/* Convert a path relative to SRCDIR/gcc/testsuite/selftests + to a real path (either absolute, or relative to pwd). + The result should be freed by the caller. */ + +extern char *locate_file (const char *path); + +/* The path of SRCDIR/testsuite/selftests. */ + +extern const char *path_to_selftest_files; + /* Declarations for specific families of tests (by source file), in alphabetical order. */ extern void bitmap_c_tests (); diff --git a/gcc/testsuite/gcc.dg/cpp/pr71591.c b/gcc/testsuite/gcc.dg/cpp/pr71591.c index e92cb52..0e3d7b1 100644 --- a/gcc/testsuite/gcc.dg/cpp/pr71591.c +++ b/gcc/testsuite/gcc.dg/cpp/pr71591.c @@ -1,5 +1,5 @@ /* PR rtl-optimization/71591 */ /* { dg-do preprocess } */ -/* { dg-options "-fself-test" } */ +/* { dg-options "-fself-test=fake-value" } */ /* { dg-message "self-tests incompatible with -E" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.dg/pr78213.c b/gcc/testsuite/gcc.dg/pr78213.c index e43c83c..ebc2cce 100644 --- a/gcc/testsuite/gcc.dg/pr78213.c +++ b/gcc/testsuite/gcc.dg/pr78213.c @@ -1,6 +1,13 @@ /* { dg-do compile } */ /* { dg-options "-fself-test" } */ +/* When this test was written -fself-test took no argument, but it + has subsequently gained a mandatory argument, giving the path + to selftest support files (within the srcdir). + It's not clear how to provide this path sanely from + within DejaGnu, so for now, this test is disabled. */ +/* { dg-skip-if "" { *-*-* } } */ + /* Verify that -fself-test does not fail on a non empty source. */ int i; void bar(); void foo() diff --git a/gcc/testsuite/selftests/example.txt b/gcc/testsuite/selftests/example.txt new file mode 100644 index 0000000..fbfaa33 --- /dev/null +++ b/gcc/testsuite/selftests/example.txt @@ -0,0 +1 @@ +example of a selftest file -- 1.8.5.3
