From: Stefano Lattarini Date: Tue, 3 May 2011 09:06:30 +0000 (+0200) Subject: Merge branch 'master' into testsuite-work X-Git-Tag: ng-0.5a~89^2~253 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34c3fcb525bba3510c5cdd9ebd5311632162a35a;p=thirdparty%2Fautomake.git Merge branch 'master' into testsuite-work --- 34c3fcb525bba3510c5cdd9ebd5311632162a35a diff --cc ChangeLog index 4c04c154b,a5354c135..48c8acca3 --- a/ChangeLog +++ b/ChangeLog @@@ -1,117 -1,11 +1,125 @@@ + 2011-05-03 Stefano Lattarini + + tests: fix spurious failure in 'color2.test' + * tests/color2.test: If $MAKE contains command-line arguments (as + in e.g., "make -j2"), expect's directive "spawn $env(MAKE)" fails + spuriously, because it tries to run "$MAKE" as a single command. + Fix this with proper uses of the TCL `eval' builtin. + +2011-05-03 Stefano Lattarini + + tests: few more checks on automatic remake support + * tests/remake-all-1.test: New test, check that the "all" target + triggers rebuilt of outdated Makefiles. + * tests/remake-all-2.test: Likewise, but for when the makefiles + are not named `Makefile'. + * tests/Makefile.am (TESTS): Update. + +2011-05-03 Stefano Lattarini + + tests: check some remake features with non-GNU make too + * tests/acloca14.test ($required): Drop "GNUmake". This test + works as-is with non-GNU make implementations. + * tests/remake1a.test: Likewise. + * tests/aclocal4.test ($required): Drop "GNUmake". + Modify the test to have it work also with non-GNU make. + * tests/remake5.test: Likewise. + * tests/remake8a.test: Likewise. + * tests/remake8b.test: Likewise. + * tests/remake9a.test: Likewise. + * tests/remake9b.test: Likewise. + * tests/remake9c.test: Likewise. + * tests/remake9d.test: Likewise. + * tests/remake10a.test: Likewise. + * tests/remake10b.test: Likewise. + * tests/remake10c.test: Likewise. + * tests/remake12.test: ($required): Drop "GNUmake". + Adapt the test to make it work also with non-GNU make (if + it supports an "include" directive). + +2011-05-01 Stefano Lattarini + + tests: extend tests on dependency tracking with VPATH + * tests/depmod-tests.sh: New script, fulfilling a threefold role: + 1. it is called to generate a Makefile.am snippet, containing the + definition of proper lists of tests; + 2. it is called to set up a directory containing some common data + files and autotools-generated files used by the aforementioned + tests (this is done for speed reasons only); and + 3. it is called to properly run those tests, one at a time. + * tests/depcomp9.test: Delete, it's obsolete now. + * tests/depcomp10.test: Likewise. + * tests/Makefile.am ($(srcdir)/depmod-tests.am): Include this + snippet, which defines ... + (depmode_tests): ... this new macro, containing the list of the + newly generated `*.depmod' tests. + (TESTS_EXTENSIONS): Add `.depmod'. + (DEPMOD_LOG_COMPILER): Define. It calls `depmod-tests.sh', so that + the "depmode tests" will be executed by passing that driver script + a proper parameter. + ($(depmod_tests)): New dependency declaration (dummy, but required + in order to have make actually produce expected log files from the + `.depmod.log' suffix rule). + (TESTS): Add $(depmod_tests). + (EXTRA_DIST): Distribute depmod-tests.sh. + Other minor cosmetic changes and reorderings. + * bootstrap: Generate depmod-tests.am. + * tests/.gitignore: Updated. + +2011-05-01 Stefano Lattarini + + tests: avoid extra test generation (for `instspc' tests) + We don't really need to generate tons and tons of wrapper test + scripts (presently, ~ 90) just to run what is basically a single + test (specifically, `instspc-tests.sh') with different parameters. + In fact, the possibility of running a single driver script with + multiple files/configurations/parameters is one of the major + selling points of the 'parallel-tests' testsuite driver of + automake. So why not use ourselves more extensively the best + features we provide? + * tests/instspc-tests.sh: Update heading comments. Expect + to be executed, not sourced. Update handling of command-line + arguments. Adjust to reflect the renaming of "instspc tests" + from `instspc-*.test' to `*.instspc'. + * tests/instspc-data.test: Update heading comments. Execute + driver script `instspc-tests.sh', instead of sourcing it. + Give more informative messages in case of internal errors. + * tests/Makefile.am (TESTS_EXTENSIONS): Define explicitly (to + `.test' and `.instspc'). + (TESTS): Add `$(instspc_tests)'. + (generated_tests): Remove `$(instspc_tests)'. + (INSTSPC_LOG_COMPILER): Define. Calls `instspc-tests.sh', so + that the "instspc tests" will be now executed by passing that + driver script a proper parameter. + ($(instspc_tests)): Remove, we don't need anymore to generate + this tests. + ($(instspc_tests:.test=.log)): Remove, substituted by ... + ($(instspc_tests:.instspc=.log)): ... this. + ($(instspc_tests)): New dependency declaration (dummy, but + required in order to have make actually produce expected log + files from the `.instspc.log' suffix rule). + (MAINTAINERCLEANFILES, generated_tests): Don't extend with + $(instspc_tests) anymore. + Update comments. + +2011-05-01 Stefano Lattarini + + build: improve the definition of the list of testcases + * tests/Makefile.am (handwritten_tests): New variable. + (generated_tests): Likewise. + (TESTS): Redefine as the union of the above. + (EXTRA_DIST): Extend using $(handwritten_tests) and + $(generated_tests) rather than $(TESTS). + * tests/gen-parallel-tests: Update accordingly, and + make more robust. + +2011-05-01 Stefano Lattarini + + tests skips: shorter and clearer messages + * tests/defs: Use shorter messages when giving reasons for test + skipping; it turns out these shorter messages are also clearer. + If more info might be useful, send them to the log file only. + 2011-05-01 Stefano Lattarini tests: fix self check spurious failure with older bash versions diff --cc tests/color2.test index e0bfdab8c,eb9c52788..26df9b2c0 --- a/tests/color2.test +++ b/tests/color2.test @@@ -39,11 -39,13 +39,11 @@@ esa # Check that we have a working expect program. cat >expect-check <<'END' #! /usr/bin/expect -f - spawn $env(THE_SYSTEM_SHELL) -c : + eval spawn $env(THE_SYSTEM_SHELL) -c : expect eof END -THE_SYSTEM_SHELL=/bin/sh expect -f expect-check || { - echo "$me: failed to find a working expect program" >&2 - Exit 77 -} +THE_SYSTEM_SHELL=/bin/sh expect -f expect-check \ + || skip_ "$me: failed to find a working expect program" # Do the tests.