build system: Break out test-common.make

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

diff --git a/.gitignore b/.gitignore
index c9dbd00d1ed4e75f06df5cddce7b2f9679a9c42d..1b9c248af15516e01d61f58daccbfa92f1428252 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ conffile.yy.[ch]
 /config.stamp.in
 Makefile
 /common.make
 /config.stamp.in
 Makefile
 /common.make

+/test-common.make

 
 msgcode-test
 msgcode-test.confirm
 
 msgcode-test
 msgcode-test.confirm

diff --git a/configure b/configure
index 58cabb8385648423e78e018adfbaccd460d40f42..e600caa57f03abfaba22386c630fb6cace1bd4dc 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-example/Makefile stest/Makefile"
+ac_config_files="$ac_config_files Makefile common.make test-common.make test-example/Makefile stest/Makefile"

 
 ac_config_commands="$ac_config_commands default"
 
 
 ac_config_commands="$ac_config_commands default"
 


@@ -5437,6 +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-common.make") CONFIG_FILES="$CONFIG_FILES test-common.make" ;;

     "test-example/Makefile") CONFIG_FILES="$CONFIG_FILES test-example/Makefile" ;;
     "stest/Makefile") CONFIG_FILES="$CONFIG_FILES stest/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
     "test-example/Makefile") CONFIG_FILES="$CONFIG_FILES test-example/Makefile" ;;
     "stest/Makefile") CONFIG_FILES="$CONFIG_FILES stest/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;

diff --git a/configure.in b/configure.in
index 65997eff1698449b3c180feca72d79b2722b7162..40f2d705d79136082b44c6aa4c248ed6db531c4d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -96,7 +96,8 @@ else
     AC_MSG_WARN([Disabling IPv6 support])
 fi
 
     AC_MSG_WARN([Disabling IPv6 support])
 fi
 

-AC_OUTPUT(Makefile common.make test-example/Makefile stest/Makefile,
+AC_OUTPUT(Makefile common.make test-common.make
+          test-example/Makefile stest/Makefile,

           echo timestamp >config.stamp)
 
 AH_TOP([
           echo timestamp >config.stamp)
 
 AH_TOP([

diff --git a/stest/Makefile.in b/stest/Makefile.in
index dad720e9a6644730496b51f314107ac6b62a30df..40ef0dbb26899a41e0682e93050f1113330b0a26 100644 (file)
--- a/stest/Makefile.in
+++ b/stest/Makefile.in
@@ -3,20 +3,14 @@ VPATH:=@srcdir@
 srcdir:=@srcdir@
 topdir:=@top_srcdir@
 
 srcdir:=@srcdir@
 topdir:=@top_srcdir@
 

-include ../common.make
-
-TARGETS=udp-preload.so check
-
-TESTSCRIPTS ?= $(shell echo $(srcdir)/t-*[0-9a-z])
-TESTNAMES := $(patsubst t-%,%,$(notdir $(TESTSCRIPTS)))
+TARGETS += udp-preload.so

 
 DEPS += udp-preload.so
 DEPS += $(srcdir)/common.tcl
 
 DEPS += udp-preload.so
 DEPS += $(srcdir)/common.tcl

-DEPS += $(topdir)/test-common.tcl

 DEPS += ../secnet
 DEPS += ../test-example/sites.conf
 
 DEPS += ../secnet
 DEPS += ../test-example/sites.conf
 

-all: $(TARGETS)
+include ../test-common.make

 
 CFLAGS += -D_REENTRANT -fPIC
 
 
 CFLAGS += -D_REENTRANT -fPIC
 


@@ -40,16 +34,3 @@ MAKE_NOTSPECIAL:=$(MAKE)
 check:
        env -u MAKEFLAGS -u MFLAGS \
        $(MAKE_NOTSPECIAL) -j$(shell nproc || 1)0 check-real
 check:
        env -u MAKEFLAGS -u MFLAGS \
        $(MAKE_NOTSPECIAL) -j$(shell nproc || 1)0 check-real

-
-check-real: $(foreach t,$(TESTNAMES),d-$t/ok)
-
-d-%/ok: $(srcdir)/t-% $(DEPS)
-       @rm -rf d-$*; mkdir d-$*
-       export STEST_BUILDDIR=$(topbuilddir); \
-       cd $(topdir) && stest/t-$* >$(topbuilddir)/stest/d-$*/log 2>&1
-       @printf "$* "
-       @touch $@
-
-clean:
-       $(RM) -f *.o *.so
-       $(RM) -rf tmp

diff --git a/test-common.make.in b/test-common.make.in
new file mode 100644 (file)
index 0000000..fb82335
--- /dev/null
+++ b/test-common.make.in
@@ -0,0 +1,25 @@
+
+include ../common.make
+
+TESTSCRIPTS ?= $(shell echo $(srcdir)/t-*[0-9a-z])
+TESTNAMES := $(patsubst t-%,%,$(notdir $(TESTSCRIPTS)))
+
+DEPS += $(topdir)/test-common.tcl
+
+TARGETS += check
+
+all: $(TARGETS)
+
+check-real: $(foreach t,$(TESTNAMES),d-$t/ok)
+
+d-%/ok: $(srcdir)/t-% $(DEPS)
+       @rm -rf d-$*; mkdir d-$*
+       export STEST_BUILDDIR=$(topbuilddir); \
+       cd $(topdir) && stest/t-$* >$(topbuilddir)/stest/d-$*/log 2>&1
+       @printf "$* "
+       @touch $@
+
+clean:
+       $(RM) -f *.o *.so
+       $(RM) -rf tmp
+       $(RM) -rf d-*