Rename empty-string-tests to string-tests, because we have nonempty c…

…ases.
farsightsec · Nov 2, 2017 · a98eaf5 · a98eaf5
1 parent 1290290
commit a98eaf5
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 14 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -32,16 +32,16 @@ EXTRA_DIST += \
 	tests/json-utf8-tests/test.sh.in \
 	tests/json-utf8-tests/truncated.nmsg \
 	tests/nmsg.test \
-	tests/empty-string-tests/empty-string.json \
-	tests/empty-string-tests/empty-string.nmsg \
-	tests/empty-string-tests/empty-string.pres \
-	tests/empty-string-tests/empty-string-term.nmsg \
-	tests/empty-string-tests/empty-string-term.pres \
-	tests/empty-string-tests/string-nonterm.nmsg \
-	tests/empty-string-tests/string-nonterm.pres \
-	tests/empty-string-tests/string.json \
-	tests/empty-string-tests/string.nmsg \
-	tests/empty-string-tests/string.pres \
+	tests/string-tests/empty-string.json \
+	tests/string-tests/empty-string.nmsg \
+	tests/string-tests/empty-string.pres \
+	tests/string-tests/empty-string-term.nmsg \
+	tests/string-tests/empty-string-term.pres \
+	tests/string-tests/string-nonterm.nmsg \
+	tests/string-tests/string-nonterm.pres \
+	tests/string-tests/string.json \
+	tests/string-tests/string.nmsg \
+	tests/string-tests/string.pres \
 	tests/nmsg-dnstap-tests/test.nmsg \
 	tests/nmsg-dnstap-tests/test.sh.in \
 	tests/payload-crc32c-tests/test.sh.in \

diff --git a/configure.ac b/configure.ac
@@ -30,8 +30,8 @@ AC_CONFIG_FILES([tests/udp-checksum-tests/test.sh],
 AC_CONFIG_FILES([tests/payload-crc32c-tests/test.sh],
                 [chmod +x tests/payload-crc32c-tests/test.sh])
 
-AC_CONFIG_FILES([tests/empty-string-tests/test.sh],
-                [chmod +x tests/empty-string-tests/test.sh])
+AC_CONFIG_FILES([tests/string-tests/test.sh],
+                [chmod +x tests/string-tests/test.sh])
 
 AC_CONFIG_HEADER([config.h])
 

diff --git a/tests/.gitignore b/tests/.gitignore
@@ -1,6 +1,6 @@
 test-layout-fltmod_plugin
 test-nmsg_output_set_rate
-empty-string-tests/test.sh
+string-tests/test.sh
 json-utf8-tests/test.sh
 nmsg-dnstap-tests/test.sh
 payload-crc32c-tests/test.sh

diff --git a/tests/nmsg.test b/tests/nmsg.test
@@ -4,7 +4,7 @@ TESTS="udp-checksum-tests \
 	payload-crc32c-tests \
 	nmsg-dnstap-tests \
 	json-utf8-tests \
-	empty-string-tests"
+	string-tests"
 
 for x in $TESTS; do
     testdir="tests/$x"

diff --git a/...empty-string-tests/empty-string-term.nmsg → tests/string-tests/empty-string-term.nmsg b/...empty-string-tests/empty-string-term.nmsg → tests/string-tests/empty-string-term.nmsg
diff --git a/...empty-string-tests/empty-string-term.pres → tests/string-tests/empty-string-term.pres b/...empty-string-tests/empty-string-term.pres → tests/string-tests/empty-string-term.pres
diff --git a/tests/empty-string-tests/empty-string.json → tests/string-tests/empty-string.json b/tests/empty-string-tests/empty-string.json → tests/string-tests/empty-string.json
diff --git a/tests/empty-string-tests/empty-string.nmsg → tests/string-tests/empty-string.nmsg b/tests/empty-string-tests/empty-string.nmsg → tests/string-tests/empty-string.nmsg
diff --git a/tests/empty-string-tests/empty-string.pres → tests/string-tests/empty-string.pres b/tests/empty-string-tests/empty-string.pres → tests/string-tests/empty-string.pres
diff --git a/tests/empty-string-tests/string-nonterm.nmsg → tests/string-tests/string-nonterm.nmsg b/tests/empty-string-tests/string-nonterm.nmsg → tests/string-tests/string-nonterm.nmsg
diff --git a/tests/empty-string-tests/string-nonterm.pres → tests/string-tests/string-nonterm.pres b/tests/empty-string-tests/string-nonterm.pres → tests/string-tests/string-nonterm.pres
diff --git a/tests/empty-string-tests/string.json → tests/string-tests/string.json b/tests/empty-string-tests/string.json → tests/string-tests/string.json
diff --git a/tests/empty-string-tests/string.nmsg → tests/string-tests/string.nmsg b/tests/empty-string-tests/string.nmsg → tests/string-tests/string.nmsg
diff --git a/tests/empty-string-tests/string.pres → tests/string-tests/string.pres b/tests/empty-string-tests/string.pres → tests/string-tests/string.pres
diff --git a/tests/empty-string-tests/test.sh.in → tests/string-tests/test.sh.in b/tests/empty-string-tests/test.sh.in → tests/string-tests/test.sh.in