From 967f512fdc26fcd75a5d6789597620494117bc15 Mon Sep 17 00:00:00 2001 From: James Cherry Date: Fri, 5 Dec 2025 14:47:27 -0700 Subject: [PATCH] rename test groups Signed-off-by: James Cherry --- test/regression | 1 + test/regression_vars.tcl | 62 ++++++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/test/regression b/test/regression index 2688454a..a64ac704 100755 --- a/test/regression +++ b/test/regression @@ -31,6 +31,7 @@ exec tclsh $0 ${1+"$@"} # Directory containing tests. set test_dir [file dirname [file normalize [info script]]] +set sta_dir [file normalize [file join $test_dir ".."]] source [file join $test_dir regression_vars.tcl] source [file join $test_dir regression.tcl] diff --git a/test/regression_vars.tcl b/test/regression_vars.tcl index f3eb42e9..9a0a04d9 100644 --- a/test/regression_vars.tcl +++ b/test/regression_vars.tcl @@ -34,7 +34,6 @@ # Application program to run tests on. set app "sta" -set sta_dir [file dirname $test_dir] set app_path [file join $sta_dir "build" $app] # Application options. set app_options "-no_init -no_splash -exit" @@ -52,7 +51,7 @@ if [info exists env(DIFF_OPTIONS)] { } set valgrind_suppress [file join $test_dir valgrind.suppress] -set valgrind_options "--num-callers=20 --leak-check=full --freelist-vol=100000000 --leak-resolution=high --suppressions=$valgrind_suppress" +set valgrind_options "--num-callers=20 --leak-check=full --show-leak-kinds=all --leak-resolution=high --suppressions=$valgrind_suppress" if { [exec "uname"] == "Darwin" } { append valgrind_options " --dsymutil=yes" } @@ -71,31 +70,6 @@ proc record_test { test cmd_dir } { return $test } -# Record tests in the $STA/test directory. -proc record_sta_tests { tests } { - global test_dir - foreach test $tests { - # Prune commented tests from the list. - if { [string index $test 0] != "#" } { - record_test $test $test_dir - } - } -} - -# Record tests in the $STA/examples directory. -proc record_example_tests { tests } { - global test_dir test_groups - set example_dir [file join $test_dir ".." "examples"] - foreach test $tests { - # Prune commented tests from the list. - if { [string index $test 0] != "#" } { - record_test $test $example_dir - } - } -} - -################################################################ - proc define_test_group { name tests } { global test_groups set test_groups($name) $tests @@ -124,6 +98,38 @@ proc list_delete { list delete } { ################################################################ +# Record tests in $STA/test. +proc record_public_tests { tests } { + global sta_dir cmd_dirs test_groups test_dir + set public_dir [file join $sta_dir "test"] + foreach test $tests { + if { [string index $test 0] != "#" } { + record_test $test $public_dir + # sync pvt/test okfiles to sta/test + set public_ok [file join $public_dir $test.ok] + if { [file exists $public_ok] } { + file copy -force $public_ok [file join $test_dir $test.ok] + } + } + } + define_test_group public $tests +} + +# Record tests in the $STA/examples directory. +proc record_example_tests { tests } { + global test_dir test_groups + set example_dir [file join $test_dir ".." "examples"] + foreach test $tests { + # Prune commented tests from the list. + if { [string index $test 0] != "#" } { + record_test $test $example_dir + } + } + define_test_group examples $tests +} + +################################################################ + # Regression test lists. # Record tests in sta/examples @@ -137,7 +143,7 @@ record_example_tests { spef_parasitics } -record_sta_tests { +record_public_tests { disconnect_mcp_pin get_filter get_is_buffer