diff options
author | Jacob Bachmeyer <jcb62281@gmail.com> | 2018-12-11 22:33:29 +1100 |
---|---|---|
committer | Ben Elliston <bje@gnu.org> | 2018-12-11 22:33:29 +1100 |
commit | 48fbec72a052b82b14eb96716da6c249d0a673c0 (patch) | |
tree | 025d55f827a9a882a352649c19c43a2713aef942 /Makefile.am | |
parent | 0a5a8a9d3b55cf0bc64d2b5ff4d272a3302a283d (diff) | |
download | dejagnu-48fbec72a052b82b14eb96716da6c249d0a673c0.zip dejagnu-48fbec72a052b82b14eb96716da6c249d0a673c0.tar.gz dejagnu-48fbec72a052b82b14eb96716da6c249d0a673c0.tar.bz2 |
* testsuite/runtest.all/libs.exp: Use "testsuite file" command.
* testsuite/runtest.all/load_lib.exp: Likewise.
* testsuite/runtest.all/stats.exp: Likewise.
* testsuite/runtest.all/stats.exp: Write local init file as
"stats-init.exp" for status summary tests. Use --local_init
option to runtest to load that file instead of site.exp and move
the inner test module to a nested testsuite.
* testsuite/runtest.all/stats-sub.exp: Move file from here ..
* testsuite/runtest.all/stats/testsuite/stat.test/stats-sub.exp:
.. to here.
* testsuite/runtest.all/options.exp: Clean up whitespace in file.
Wrap lines in test list and move short items to beginning of list.
Write local init file as "options-init.exp" for options tests.
Use --local_init option with nested runtest to load that file
instead of site.exp; also create an empty nested testsuite. Local
init file arranges for inner runtest processes to run in a
subdirectory in the object tree to eliminate filename clashes.
Set tmpdir if not already set and remove entire temporary
directory after running options tests.
* testsuite/runtest.all/options/testsuite/null.test/null.exp: New.
* testsuite/runtest.all/clone_output.test: Move from here ..
* testsuite/runtest.libs/clone_output.test: .. to here.
* testsuite/runtest.all/config.test: Move from here ..
* testsuite/runtest.libs/config.test: .. to here.
* testsuite/runtest.all/default_procs.tcl: Move from here ..
* testsuite/runtest.libs/default_procs.tcl: .. to here.
* testsuite/runtest.all/libs.exp: Move from here ..
* testsuite/runtest.libs/libs.exp: .. to here.
* testsuite/runtest.all/load_lib.exp: Move from here ..
* testsuite/runtest.libs/load_lib.exp: .. to here.
* testsuite/runtest.all/remote.test: Move from here ..
* testsuite/runtest.libs/remote.test: .. to here.
* testsuite/runtest.all/target.test: Move from here ..
* testsuite/runtest.libs/target.test: .. to here.
* testsuite/runtest.all/testsuite_file.test: Move from here ..
* testsuite/runtest.libs/testsuite_file.test: .. to here.
* testsuite/runtest.all/topdir/subdir1/subfile1: Move from here ..
* testsuite/runtest.libs/topdir/subdir1/subfile1: .. to here.
* testsuite/runtest.all/topdir/subdir1/subfile2: Move from here ..
* testsuite/runtest.libs/topdir/subdir1/subfile2: .. to here.
* testsuite/runtest.all/topdir/subdir1/subsubdir1/subsubfile1:
Move from here ..
* testsuite/runtest.libs/topdir/subdir1/subsubdir1/subsubfile1:
.. to here.
* testsuite/runtest.all/topdir/subdir2/subfile2: Move from here ..
* testsuite/runtest.libs/topdir/subdir2/subfile2: .. to here.
* testsuite/runtest.all/utils.test: Move from here ..
* testsuite/runtest.libs/utils.test: .. to here.
* testsuite/runtest.libs/utils.test: Update references to
"runtest.all".
* testsuite/runtest.all/options.exp: Move from here ..
* testsuite/runtest.main/options.exp: .. to here.
* testsuite/runtest.all/options/testsuite/null.test/null.exp: Move
from here ..
* testsuite/runtest.main/options/testsuite/null.test/null.exp:
.. to here.
* testsuite/runtest.all/stats.exp: Move from here ..
* testsuite/runtest.main/stats.exp: .. to here.
* testsuite/runtest.all/stats/testsuite/stat.test/stats-sub.exp:
Move from here ..
* testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp:
.. to here.
* Makefile.am (DISTCLEANFILES): Update for testsuite improvements.
(TESTSUITE_FILES): Update to reflect testsuite reorganization.
* Makefile.in: Regenerate.
Signed-off-by: Ben Elliston <bje@gnu.org>
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 9147321..9c21c94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,8 +25,7 @@ EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest \ $(pkgdata_DATA) $(config_DATA) $(baseboard_DATA) \ $(TESTSUITE_FILES) $(XML) $(CONTRIB) $(TEXINFO_TEX) -DISTCLEANFILES = xXx.log xXx.sum x.log x.sum testrun.log \ - testrun.sum testrun.xml +DISTCLEANFILES = options-init.exp stats-init.exp # Give a reassuring message so that users know the "build" worked. all-local: @@ -143,21 +142,22 @@ CONTRIB = contrib/compare_tests contrib/sum2junit.sh \ # Testsuite. TESTSUITE_FILES = \ - testsuite/runtest.all/topdir/subdir1/subsubdir1/subsubfile1 \ - testsuite/runtest.all/topdir/subdir1/subfile1 \ - testsuite/runtest.all/topdir/subdir1/subfile2 \ - testsuite/runtest.all/topdir/subdir2/subfile2 \ - testsuite/runtest.all/libs.exp \ - testsuite/runtest.all/options.exp \ - testsuite/runtest.all/remote.test \ - testsuite/runtest.all/stats-sub.exp \ - testsuite/runtest.all/stats.exp \ - testsuite/runtest.all/target.test \ - testsuite/runtest.all/utils.test \ - testsuite/runtest.all/clone_output.test \ - testsuite/runtest.all/config.test \ - testsuite/runtest.all/default_procs.tcl \ - testsuite/runtest.all/load_lib.exp \ + testsuite/runtest.libs/topdir/subdir1/subsubdir1/subsubfile1 \ + testsuite/runtest.libs/topdir/subdir1/subfile1 \ + testsuite/runtest.libs/topdir/subdir1/subfile2 \ + testsuite/runtest.libs/topdir/subdir2/subfile2 \ + testsuite/runtest.libs/load_lib.exp \ + testsuite/runtest.libs/libs.exp \ + testsuite/runtest.libs/default_procs.tcl \ + testsuite/runtest.libs/clone_output.test \ + testsuite/runtest.libs/config.test \ + testsuite/runtest.libs/remote.test \ + testsuite/runtest.libs/target.test \ + testsuite/runtest.libs/utils.test \ + testsuite/runtest.main/options.exp \ + testsuite/runtest.main/options/testsuite/null.test/null.exp \ + testsuite/runtest.main/stats.exp \ + testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp \ testsuite/lib/libdejagnu.exp \ testsuite/lib/libsup.exp \ testsuite/lib/runtest.exp \ |