Fix merge error

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 83e28655e841ed2fa189a440882f9b8f039ddd00..f625b0cfec16b404e4a1797b095bf3b8642eddc2 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -51,39 +51,6 @@ feature-test@EXEEXT@: feature-test.@O@
 # Running the scripts below is bypassed when a separate build directory is
 # used.
 
-# Define the tests that can be run in parallel.  This should be identical to
-# the definition of PARALLELDIRS in conf.sh.
-
-PARALLEL = allow_query rpzrecurse
-
-# Produce intermediate makefile that assigns unique port numbers to each
-# parallel test.  The start port number of 5,000 is arbitrary - it must just
-# be greater than the highest privileged port, 1024.
-#
-# Test names need to be sanitized because Solaris make does not like
-# underscores in target names and requires explicit differentiation
-# between a target name and a directory name (.PHONY is not supported).
-
-parallel.mk:
-       @PARALLEL_SANITIZED=`echo $(PARALLEL) | sed "s|\([^ ][^ ]*\)|test-\1|g;" | tr _ -` ; \
-       echo ".PHONY: $$PARALLEL_SANITIZED" > $@ ; \
-       echo "" >> $@ ; \
-       echo "check: $$PARALLEL_SANITIZED" >> $@ ; \
-       port=$${STARTPORT:-5000} ; \
-       for directory in $(PARALLEL) ; do \
-               echo "" >> $@ ; \
-               echo "test-`echo $$directory | tr _ -`:" >> $@ ; \
-               echo "  @$(SHELL) ./run.sh $$NOCLEAN -r -p $$port $$directory 2>&1 | tee $$directory/test.output" >> $@ ; \
-               port=`expr $$port + 100` ; \
-       done
-
-# Targets to run the tests.
-
-test: parallel.mk subdirs
-       @$(MAKE) -f parallel.mk check
-       @$(SHELL) ./runsequential.sh $$NOCLEAN -r
-       @$(SHELL) ./testsummary.sh
-
 # Define the tests that can be run in parallel.  This should be identical to
 # the definition of PARALLELDIRS in conf.sh. Note: long-running tests
 # such as allow_query and serve-stale are scheduled first to get more