diff options
-rw-r--r-- | ChangeLog | 43 | ||||
-rw-r--r-- | Makefile.am | 14 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | testsuite/lib/runtest.exp | 39 | ||||
-rw-r--r-- | testsuite/runtest.main/error.exp | 29 | ||||
-rw-r--r-- | testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp (renamed from testsuite/runtest.main/error/testsuite/error.test/error-al-dbz.exp) | 0 | ||||
-rw-r--r-- | testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp (renamed from testsuite/runtest.main/error/testsuite/error.test/error-dbz.exp) | 0 | ||||
-rw-r--r-- | testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp (renamed from testsuite/runtest.main/error/testsuite/error.test/error-undef.exp) | 0 | ||||
-rw-r--r-- | testsuite/runtest.main/nested/testsuite/error.test/simple.exp (renamed from testsuite/runtest.main/error/testsuite/error.test/simple.exp) | 0 | ||||
-rw-r--r-- | testsuite/runtest.main/nested/testsuite/null.test/null.exp (renamed from testsuite/runtest.main/options/testsuite/null.test/null.exp) | 0 | ||||
-rw-r--r-- | testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp (renamed from testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp) | 0 | ||||
-rw-r--r-- | testsuite/runtest.main/options.exp | 32 | ||||
-rw-r--r-- | testsuite/runtest.main/stats.exp | 26 |
13 files changed, 107 insertions, 78 deletions
@@ -1,3 +1,46 @@ +2020-07-20 Jacob Bachmeyer <jcb62281+dev@gmail.com> + + * Makefile.am (CLEANFILES): Update. + (TESTSUITE_FILES): Update to reflect testsuite reorganization. + + * testsuite/lib/runtest.exp (runtest_setup_nested_testsuite): New + procedure. + (runtest_cleanup_nested_testsuite): New procedure. + + * testsuite/runtest.main/error.exp: Use the tool name "error" to + select the proper subset of the nested testsuite. Use new + procedures for handling nested testsuite. Use common + nested-init.exp local init file for nested testsuite. Let local + init file nested-init.exp handle setting "outdir" variable. + * testsuite/runtest.main/options.exp: Likewise; "null" tool. + * testsuite/runtest.main/stats.exp: Likewise; "stat" tool. + + * testsuite/runtest.main/nested/: Combine nested testsuites. + * testsuite/runtest.main/error/testsuite/error.test/error-al-dbz.exp: + Move from here... + * testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp: + ...to here. + * testsuite/runtest.main/error/testsuite/error.test/error-dbz.exp: + Move from here... + * testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp: + ...to here. + * testsuite/runtest.main/error/testsuite/error.test/error-undef.exp: + Move from here... + * testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp: + ...to here. + * testsuite/runtest.main/error/testsuite/error.test/simple.exp: + Move from here... + * testsuite/runtest.main/nested/testsuite/error.test/simple.exp: + ...to here. + * testsuite/runtest.main/options/testsuite/null.test/null.exp: + Move from here... + * testsuite/runtest.main/nested/testsuite/null.test/null.exp: + ...to here. + * testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp: + Move from here... + * testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp: + ...to here. + 2020-07-16 Rob Savoye <rob@senecass.com> * baseboards/qemu.exp: Works now with qemu instead of sim. diff --git a/Makefile.am b/Makefile.am index 999b25b..a64d9a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ EXTRA_DIST = ChangeLog-1992 MAINTAINERS dejagnu runtest \ $(commands_DATA) $(TESTSUITE_FILES) $(TEXINFO_TEX)\ $(CONTRIB) -CLEANFILES = error-init.exp options-init.exp stats-init.exp +CLEANFILES = dbg.log nested-init.exp clean-local: clean-local-check .PHONY: clean-local-check @@ -182,14 +182,14 @@ TESTSUITE_FILES = \ testsuite/runtest.libs/target.test \ testsuite/runtest.libs/utils.test \ testsuite/runtest.main/error.exp \ - testsuite/runtest.main/error/testsuite/error.test/error-al-dbz.exp \ - testsuite/runtest.main/error/testsuite/error.test/error-dbz.exp \ - testsuite/runtest.main/error/testsuite/error.test/error-undef.exp \ - testsuite/runtest.main/error/testsuite/error.test/simple.exp \ + testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp \ + testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp \ + testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp \ + testsuite/runtest.main/nested/testsuite/error.test/simple.exp \ testsuite/runtest.main/options.exp \ - testsuite/runtest.main/options/testsuite/null.test/null.exp \ + testsuite/runtest.main/nested/testsuite/null.test/null.exp \ testsuite/runtest.main/stats.exp \ - testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp \ + testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp \ testsuite/lib/bohman_ssd.exp \ testsuite/lib/launcher.exp \ testsuite/lib/libdejagnu.exp \ diff --git a/Makefile.in b/Makefile.in index fb19047..673a072 100644 --- a/Makefile.in +++ b/Makefile.in @@ -383,7 +383,7 @@ EXTRA_DIST = ChangeLog-1992 MAINTAINERS dejagnu runtest \ $(commands_DATA) $(TESTSUITE_FILES) $(TEXINFO_TEX)\ $(CONTRIB) -CLEANFILES = error-init.exp options-init.exp stats-init.exp +CLEANFILES = dbg.log nested-init.exp bin_SCRIPTS = dejagnu runtest include_HEADERS = dejagnu.h pkgdata_DATA = \ diff --git a/testsuite/lib/runtest.exp b/testsuite/lib/runtest.exp index 67643b4..bbb541b 100644 --- a/testsuite/lib/runtest.exp +++ b/testsuite/lib/runtest.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992-2016, 2018 Free Software Foundation, Inc. +# Copyright (C) 1992-2016, 2018, 2020 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -37,6 +37,43 @@ if { [which $EXPECT] == 0 } { } # +# support procedures for running items in a nested testsuite +# +# Note that these procedures establish and use a "tmpdir" variable in the +# caller's context. +proc runtest_setup_nested_testsuite {} { + global host_triplet + upvar 1 tmpdir tmpdir + + if {![info exists tmpdir]} { + set tmpdir [testsuite file -object -top tmpdir] + } + + set fd [open nested-init.exp w] + puts $fd "set host_triplet $host_triplet" + puts $fd "set srcdir [testsuite file -source -test nested]" + puts $fd "set objdir [testsuite file -object -test nested]" + puts $fd "set tmpdir $tmpdir" + puts $fd "set outdir $tmpdir" + close $fd + + if {![file isdirectory $tmpdir]} { + catch {file mkdir $tmpdir} + } + + if {![file isdirectory [testsuite file -object -test nested]]} { + catch {file mkdir [testsuite file -object -test nested]} + } +} + +proc runtest_cleanup_nested_testsuite {} { + upvar 1 tmpdir tmpdir + + file delete -force $tmpdir +} + + +# # runtest_version -- extract and print the version number # proc runtest_version { } { diff --git a/testsuite/runtest.main/error.exp b/testsuite/runtest.main/error.exp index 1473ee1..8d5795f 100644 --- a/testsuite/runtest.main/error.exp +++ b/testsuite/runtest.main/error.exp @@ -22,23 +22,7 @@ load_lib util-defs.exp -if {![info exists tmpdir]} { - set tmpdir [testsuite file -object -top tmpdir] -} - -set fd [open error-init.exp w] -puts $fd "set srcdir [testsuite file -source -test error]" -puts $fd "set objdir [testsuite file -object -test error]" -puts $fd "set tmpdir $tmpdir" -close $fd - -if {![file isdirectory $tmpdir]} { - catch "file mkdir $tmpdir" -} - -if {![file isdirectory [testsuite file -object -test error]]} { - catch {file mkdir [testsuite file -object -test error]} -} +runtest_setup_nested_testsuite set tests { { "run only simple test" @@ -67,8 +51,8 @@ set tests { foreach t $tests { if [util_test $RUNTEST \ - "--local_init error-init.exp\ - --outdir $tmpdir -a [lindex $t 1]" \ + "--local_init nested-init.exp --tool error\ + -a [lindex $t 1]" \ "" \ [lindex $t 2]] { fail [lindex $t 0] @@ -77,5 +61,8 @@ foreach t $tests { } } -file delete -force $tmpdir -file delete -force [testsuite file -object -test error testsuite error.test lib] +runtest_cleanup_nested_testsuite + +# remove the autoload files generated during the test +file delete -force \ + [testsuite file -object -test nested testsuite error.test lib] diff --git a/testsuite/runtest.main/error/testsuite/error.test/error-al-dbz.exp b/testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp index 52b5bc3..52b5bc3 100644 --- a/testsuite/runtest.main/error/testsuite/error.test/error-al-dbz.exp +++ b/testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp diff --git a/testsuite/runtest.main/error/testsuite/error.test/error-dbz.exp b/testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp index 463337a..463337a 100644 --- a/testsuite/runtest.main/error/testsuite/error.test/error-dbz.exp +++ b/testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp diff --git a/testsuite/runtest.main/error/testsuite/error.test/error-undef.exp b/testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp index fa59f4a..fa59f4a 100644 --- a/testsuite/runtest.main/error/testsuite/error.test/error-undef.exp +++ b/testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp diff --git a/testsuite/runtest.main/error/testsuite/error.test/simple.exp b/testsuite/runtest.main/nested/testsuite/error.test/simple.exp index 93a03e7..93a03e7 100644 --- a/testsuite/runtest.main/error/testsuite/error.test/simple.exp +++ b/testsuite/runtest.main/nested/testsuite/error.test/simple.exp diff --git a/testsuite/runtest.main/options/testsuite/null.test/null.exp b/testsuite/runtest.main/nested/testsuite/null.test/null.exp index f6f11af..f6f11af 100644 --- a/testsuite/runtest.main/options/testsuite/null.test/null.exp +++ b/testsuite/runtest.main/nested/testsuite/null.test/null.exp diff --git a/testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp b/testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp index c797ad1..c797ad1 100644 --- a/testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp +++ b/testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp diff --git a/testsuite/runtest.main/options.exp b/testsuite/runtest.main/options.exp index abbdc6a..2e2d81c 100644 --- a/testsuite/runtest.main/options.exp +++ b/testsuite/runtest.main/options.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992-2016, 2018 Free Software Foundation, Inc. +# Copyright (C) 1992-2016, 2018, 2020 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -20,25 +20,7 @@ load_lib util-defs.exp -if {![info exists tmpdir]} { - set tmpdir [testsuite file -object -top tmpdir] -} - -set fd [open options-init.exp w] -puts $fd "set host_triplet $host_triplet" -puts $fd "set srcdir [testsuite file -source -test options]" -puts $fd "set objdir [testsuite file -object -test options]" -puts $fd "set tmpdir $tmpdir" -puts $fd "set outdir [testsuite file -object -test options]" -close $fd - -if {![file isdirectory $tmpdir]} { - catch "file mkdir $tmpdir" -} - -if {![file isdirectory [testsuite file -object -test options]]} { - catch {file mkdir [testsuite file -object -test options]} -} +runtest_setup_nested_testsuite # # Set up the list. @@ -52,7 +34,7 @@ set tests { { "--help" "USAGE:*" "Display help" } { "-v -v -v" "Verbose level is 3" "Verbose set correctly" } { "-v --tool xXx" - "Found.*options-init\..*Loading.*utils\.exp" + "Found.*nested-init\..*Loading.*utils\.exp" "Loading library files" } { "-v --tool xXx" "Expect binary is.*Using.*main test driver" @@ -112,7 +94,7 @@ set tests { foreach t $tests { if [util_test $RUNTEST \ - "[lindex $t 0] --local_init options-init.exp" \ + "[lindex $t 0] --local_init nested-init.exp --tool null" \ "" \ "[lindex $t 1]"] { fail "[lindex $t 2]" @@ -121,8 +103,4 @@ foreach t $tests { } } -# clean up log files left by the child runtest -foreach f [glob [testsuite file -object -test options *]] { - file delete $f -} -file delete -force $tmpdir +runtest_cleanup_nested_testsuite diff --git a/testsuite/runtest.main/stats.exp b/testsuite/runtest.main/stats.exp index a81c8e6..39093ec 100644 --- a/testsuite/runtest.main/stats.exp +++ b/testsuite/runtest.main/stats.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1995-2016, 2018 Free Software Foundation, Inc. +# Copyright (C) 1995-2016, 2018, 2020 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -22,23 +22,7 @@ load_lib util-defs.exp -if {![info exists tmpdir]} { - set tmpdir [testsuite file -object -top tmpdir] -} - -set fd [open stats-init.exp w] -puts $fd "set srcdir [testsuite file -source -test stats]" -puts $fd "set objdir [testsuite file -object -test stats]" -puts $fd "set tmpdir $tmpdir" -close $fd - -if {![file isdirectory $tmpdir]} { - catch "file mkdir $tmpdir" -} - -if {![file isdirectory [testsuite file -object -test stats]]} { - catch {file mkdir [testsuite file -object -test stats]} -} +runtest_setup_nested_testsuite set tests { { pass "expected passes\[ \t\]+1\n" } @@ -54,8 +38,8 @@ set tests { foreach t $tests { if [util_test $RUNTEST \ - "--local_init stats-init.exp\ - --outdir $tmpdir STATS_TEST=[lindex $t 0] stats-sub.exp" \ + "--local_init nested-init.exp --tool stat\ + STATS_TEST=[lindex $t 0] stats-sub.exp" \ "" \ [lindex $t 1]] { fail [lindex $t 0] @@ -64,4 +48,4 @@ foreach t $tests { } } -file delete -force $tmpdir +runtest_cleanup_nested_testsuite |