From 6e553442518e7cd93e779d2895cb4c26ba5ba793 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 19 Oct 2019 22:10:49 +0100 Subject: [PATCH] stest: Rename from `test' We want other tests too. Signed-off-by: Ian Jackson --- .gitignore | 4 ++-- Makefile.in | 6 +++--- configure | 4 ++-- configure.in | 2 +- {test => stest}/Makefile.in | 2 +- {test => stest}/common.tcl | 4 ++-- {test => stest}/t-basic-kex | 2 +- {test => stest}/t-dyni-kex | 2 +- {test => stest}/udp-preload.c | 0 9 files changed, 13 insertions(+), 13 deletions(-) rename {test => stest}/Makefile.in (96%) rename {test => stest}/common.tcl (98%) rename {test => stest}/t-basic-kex (54%) rename {test => stest}/t-dyni-kex (75%) rename {test => stest}/udp-preload.c (100%) diff --git a/.gitignore b/.gitignore index cd8f588..3c6b2e7 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Makefile.in b/Makefile.in index 0328c1c..1c76f9a 100644 --- 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 \ - 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 diff --git a/configure b/configure index 4321ed6..841fe67 100755 --- 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;; diff --git a/configure.in b/configure.in index 658f9bb..c9a9054 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/test/Makefile.in b/stest/Makefile.in similarity index 96% rename from test/Makefile.in rename to stest/Makefile.in index 61f6df6..f985059 100644 --- 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-$* - @cd .. && test/$< >test/d-$*/log 2>&1 + @cd .. && stest/$< >stest/d-$*/log 2>&1 @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 432fa7a..ca50331 100644 --- 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) -}]} {} 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 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 caff535..0952d5f 100755 --- a/test/t-basic-kex +++ b/stest/t-basic-kex @@ -1,5 +1,5 @@ #! /usr/bin/tclsh -source test/common.tcl +source stest/common.tcl 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 e0bfb0f..4bc0087 100755 --- a/test/t-dyni-kex +++ b/stest/t-dyni-kex @@ -2,6 +2,6 @@ # Dyamic key rollover config on inside only -source test/common.tcl +source stest/common.tcl 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 -- 2.30.2