chiark / gitweb /
stest: Rename from `test'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 19 Oct 2019 21:10:49 +0000 (22:10 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 24 Oct 2019 18:16:15 +0000 (19:16 +0100)
We want other tests too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
.gitignore
Makefile.in
configure
configure.in
stest/Makefile.in [moved from test/Makefile.in with 96% similarity]
stest/common.tcl [moved from test/common.tcl with 98% similarity]
stest/t-basic-kex [moved from test/t-basic-kex with 54% similarity]
stest/t-dyni-kex [moved from test/t-dyni-kex with 75% similarity]
stest/udp-preload.c [moved from test/udp-preload.c with 100% similarity]

index cd8f588..3c6b2e7 100644 (file)
@@ -37,5 +37,5 @@ test-example/sites.conf
 test-example/bogus-setup-request
 build-stamp
 
-test/d-*
-test/udp-preload.so
+stest/d-*
+stest/udp-preload.so
index 0328c1c..1c76f9a 100644 (file)
@@ -133,7 +133,7 @@ endif
 
 check: eax-aes-test.confirm eax-serpent-test.confirm \
        eax-serpentbe-test.confirm check-ipaddrset \
-       msgcode-test.confirm check-test
+       msgcode-test.confirm check-stest
 
 version.c: Makefile
        echo "#include \"secnet.h\"" >$@.new
@@ -164,8 +164,8 @@ check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
        $(srcdir)/ipaddrset-test.py >ipaddrset-test.new
        diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
 
-check-test: secnet test-example/sites.conf
-       $(MAKE) -C test check
+check-stest: secnet test-example/sites.conf
+       $(MAKE) -C stest check
 
 test-example/sites.conf:
        $(MAKE) -C test-example
index 4321ed6..841fe67 100755 (executable)
--- a/configure
+++ b/configure
@@ -4735,7 +4735,7 @@ else
 $as_echo "$as_me: WARNING: Disabling IPv6 support" >&2;}
 fi
 
-ac_config_files="$ac_config_files Makefile common.make test/Makefile"
+ac_config_files="$ac_config_files Makefile common.make stest/Makefile"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -5437,7 +5437,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "common.make") CONFIG_FILES="$CONFIG_FILES common.make" ;;
-    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+    "stest/Makefile") CONFIG_FILES="$CONFIG_FILES stest/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
index 658f9bb..c9a9054 100644 (file)
@@ -96,7 +96,7 @@ else
     AC_MSG_WARN([Disabling IPv6 support])
 fi
 
-AC_OUTPUT(Makefile common.make test/Makefile, echo timestamp >config.stamp)
+AC_OUTPUT(Makefile common.make stest/Makefile, echo timestamp >config.stamp)
 
 AH_TOP([
 #ifndef _CONFIG_H
similarity index 96%
rename from test/Makefile.in
rename to stest/Makefile.in
index 61f6df6..f985059 100644 (file)
@@ -35,7 +35,7 @@ check-real: $(foreach t,$(TESTNAMES),d-$t/ok)
 
 d-%/ok: t-% udp-preload.so common.tcl ../secnet ../test-example/sites.conf
        @rm -rf d-$*; mkdir d-$*
-       @cd .. && test/$< >test/d-$*/log 2>&1
+       @cd .. && stest/$< >stest/d-$*/log 2>&1
        @printf "$* "
        @touch $@
 
similarity index 98%
rename from test/common.tcl
rename to stest/common.tcl
index 432fa7a..ca50331 100644 (file)
@@ -165,7 +165,7 @@ if {![catch {
     set tmp $env(AUTOPKGTEST_ARTIACTS)
 }]} {} elseif {![catch {
     set tmp $env(AUTOPKGTEST_TMP)
-}]} {} elseif {[regsub {^test/t-} $argv0 {test/d-} tmp]} {
+}]} {} elseif {[regsub {^stest/t-} $argv0 {stest/d-} tmp]} {
     file mkdir $tmp
 }
 
@@ -182,7 +182,7 @@ proc prefix_preload {lib} {
 }
 
 set env(UDP_PRELOAD_DIR) $socktmp
-prefix_preload test/udp-preload.so
+prefix_preload stest/udp-preload.so
 
 proc udp-proxy {} {
     global socktmp udpsock
similarity index 54%
rename from test/t-basic-kex
rename to stest/t-basic-kex
index caff535..0952d5f 100755 (executable)
@@ -1,5 +1,5 @@
 #! /usr/bin/tclsh
 
-source test/common.tcl
+source stest/common.tcl
 
 test-kex
similarity index 75%
rename from test/t-dyni-kex
rename to stest/t-dyni-kex
index e0bfb0f..4bc0087 100755 (executable)
@@ -2,6 +2,6 @@
 
 # Dyamic key rollover config on inside only
 
-source test/common.tcl
+source stest/common.tcl
 
 test-kex
similarity index 100%
rename from test/udp-preload.c
rename to stest/udp-preload.c