stest: Rename from `test'

We want other tests too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/.gitignore b/.gitignore
index cd8f5885c984c4084c63e816a59df09c417ae30c..3c6b2e7b8ea2e2b8caa390448e99263697de377b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,5 +37,5 @@ test-example/sites.conf
 test-example/bogus-setup-request
 build-stamp
 
 test-example/bogus-setup-request
 build-stamp
 

-test/d-*
-test/udp-preload.so
+stest/d-*
+stest/udp-preload.so

diff --git a/Makefile.in b/Makefile.in
index 0328c1cc7af320e440991f4fceb9296135858351..1c76f9a8f598de0196b3bc70e6d866ade6fc5480 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,7 +133,7 @@ endif
 
 check: eax-aes-test.confirm eax-serpent-test.confirm \
        eax-serpentbe-test.confirm check-ipaddrset \
 
 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
 
 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
 
        $(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
 
 test-example/sites.conf:
        $(MAKE) -C test-example

diff --git a/configure b/configure
index 4321ed61c87a62d531f5ddc9e66e24bef5731de4..841fe6701224ee3ea59b20e8e78e83291fd05451 100755 (executable)
--- a/configure
+++ b/configure
@@ -4735,7 +4735,7 @@ else
 $as_echo "$as_me: WARNING: Disabling IPv6 support" >&2;}
 fi
 
 $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"
 
 
 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" ;;
     "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;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

diff --git a/configure.in b/configure.in
index 658f9bb159c1fa98329aee311fb6e1846343c7ad..c9a9054a4930bb67729591d9ee990ea9ffd8ecca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -96,7 +96,7 @@ else
     AC_MSG_WARN([Disabling IPv6 support])
 fi
 
     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
 
 AH_TOP([
 #ifndef _CONFIG_H

diff --git a/test/Makefile.in b/stest/Makefile.in
similarity index 96%
rename from test/Makefile.in
rename to stest/Makefile.in
index 61f6df6be7069b81f5681c09ec766b5068b3d9ed..f9850594d74707357fb106351d46b03c69a55bf9 100644 (file)
--- a/test/Makefile.in
+++ b/stest/Makefile.in
@@ -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-$*
 
 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 $@
 
        @printf "$* "
        @touch $@
 

diff --git a/test/common.tcl b/stest/common.tcl
similarity index 98%
rename from test/common.tcl
rename to stest/common.tcl
index 432fa7a36b33a54007680b266f84d2d44d8b8c67..ca503314eec88d75e651e8c6ba5a3aa108de45cb 100644 (file)
--- a/test/common.tcl
+++ b/stest/common.tcl
@@ -165,7 +165,7 @@ if {![catch {
     set tmp $env(AUTOPKGTEST_ARTIACTS)
 }]} {} elseif {![catch {
     set tmp $env(AUTOPKGTEST_TMP)
     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
 }
 
     file mkdir $tmp
 }
 


@@ -182,7 +182,7 @@ proc prefix_preload {lib} {
 }
 
 set env(UDP_PRELOAD_DIR) $socktmp
 }
 
 set env(UDP_PRELOAD_DIR) $socktmp

-prefix_preload test/udp-preload.so
+prefix_preload stest/udp-preload.so

 
 proc udp-proxy {} {
     global socktmp udpsock
 
 proc udp-proxy {} {
     global socktmp udpsock

diff --git a/test/t-basic-kex b/stest/t-basic-kex
similarity index 54%
rename from test/t-basic-kex
rename to stest/t-basic-kex
index caff535fe273180f68b02987ed0537c92d093fa3..0952d5fe000db66235df4bf7654bdede1c450fc7 100755 (executable)
--- a/test/t-basic-kex
+++ b/stest/t-basic-kex
@@ -1,5 +1,5 @@
 #! /usr/bin/tclsh
 
 #! /usr/bin/tclsh
 

-source test/common.tcl
+source stest/common.tcl

 
 test-kex
 
 test-kex

diff --git a/test/t-dyni-kex b/stest/t-dyni-kex
similarity index 75%
rename from test/t-dyni-kex
rename to stest/t-dyni-kex
index e0bfb0fccbe768ceaaa55e6f354bcabd791f9828..4bc0087ee58180c48fff65de9e851b063920e91e 100755 (executable)
--- a/test/t-dyni-kex
+++ b/stest/t-dyni-kex
@@ -2,6 +2,6 @@
 
 # Dyamic key rollover config on inside only
 
 
 # Dyamic key rollover config on inside only
 

-source test/common.tcl
+source stest/common.tcl

 
 test-kex
 
 test-kex

diff --git a/test/udp-preload.c b/stest/udp-preload.c
similarity index 100%
rename from test/udp-preload.c
rename to stest/udp-preload.c