[rt42931] Some cleanups in bin/tests/system/conf.sh.in and conf.sh.win.in

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 74fe872579044712c9d54b87334cc1a731ff7e9c..064c76a9571fe5d9bb8afc0ae7d60cbd9ec45210 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -57,8 +57,6 @@ FSTRM_CAPTURE=@FSTRM_CAPTURE@
 
 RANDFILE=$TOP/bin/tests/system/random.data
 
-# There's no trailing period on Windows
-TP=.
 
 # The "stress" test is not run by default since it creates enough
 # load on the machine to make it unusable to other users.
@@ -76,6 +74,13 @@ SUBDIRS="acl additional addzone allow_query autosign builtin cacheclean case
         tkey tsig tsiggss unknown upforwd verify views wildcard xfer
         xferquota zero zonechecks"
 
+# Things that are different on Windows
+KILL=kill
+DIFF=diff
+DOS2UNIX=true
+# There's no trailing period on Windows
+TP=.
+
 # Use the CONFIG_SHELL detected by configure for tests
 SHELL=@SHELL@
 

diff --git a/bin/tests/system/conf.sh.win.in b/bin/tests/system/conf.sh.win.in
index 7dfbe27abf7aaa999f6cbfbef95c7f6e1af381fe..3e2994f85ea55a4bdece7346c0c75227226d8624 100644 (file)
--- a/bin/tests/system/conf.sh.win.in
+++ b/bin/tests/system/conf.sh.win.in
@@ -57,9 +57,6 @@ FSTRM_CAPTURE=@FSTRM_CAPTURE@
 
 RANDFILE=$TOP/bin/tests/system/random.data
 
-# No trailing period on Windows
-TP=
-
 # The "stress" test is not run by default since it creates enough
 # load on the machine to make it unusable to other users.
 # v6synth
@@ -76,6 +73,13 @@ SUBDIRS="acl additional addzone allow_query autosign builtin cacheclean case
         tkey tsig tsiggss unknown upforwd verify views wildcard xfer
         xferquota zero zonechecks"
 
+#Things that are different on Windows
+KILL="/bin/kill -f"
+DIFF="diff --strip-trailing-cr"
+DOS2UNIX=dos2unix
+# No trailing period
+TP=
+
 # Configure is launched from native environment, but tests are run in Cygwin -
 # so any detection is unreliable. 
 SHELL="/bin/bash -o igncr"