Changeset e78bc78 in mod_gnutls

Timestamp:

Jan 26, 2015, 10:43:35 AM (6 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

302965e

Parents:

87208b5

Message:

Adjust test tools and documentation to split tests and moved test dir

Paths, descriptions and an error message were adjusted in README and
setup. A bigger change was needed in the "newtest" script, which now
creates a script for "make check" to call. This script is not
automatically added to the list of tests in Makefile.am, but the user is
advised to add it when ready.

Location:

test

Files:

• README (modified) (3 diffs)
• newtest (modified) (2 diffs)
• setup (modified) (1 diff)

test/README

@@ -11 +11 @@
 =================
 
-from the top level of the source, or from t/ (where this README is),
+from the top level of the source, or from test/ (where this README is),
 just run:
 
  make check
 
-from t/ you can also run specific tests (identified by number) with:
+from test/ you can also run specific tests (identified by number) with:
 
  make -f TestMakefile t-3
@@ -29 +29 @@
 Please add more tests!
 
-The simplest way to add a test is (from t/):
+The simplest way to add a test is (from test/):
 
  ./newtest
 
-This will prompt you for a simple name for the test and then copy a starting
-set of files from tests/00_basic.
+This will prompt you for a simple name for the test and then copy a
+starting set of files from tests/00_basic, and create a script which
+you can add to TESTS in Makefile.am when your test is ready for
+inclusion in the test suite.
 
 
@@ -40 +42 @@
 ==============
 
-Each test consists of a directory in t/tests/, which will cause the
+Each test consists of a directory in test/tests/, which will cause the
 test suite to spin up an isolated apache instance and try to connect
 to it with gnutls-cli and make a simple HTTP 1.1 request.

test/newtest

@@ -10 +10 @@
 
     tname="${TEST_NAME// /_}"
-    newname="$(printf "%02d_%s" "$(( $(ls -d tests/* | sed 's|^[^/]*/\([0-9]*\)_.*|\1|' | sort -n | tail -n 1 | sed s/^0//) + 1 ))" "$tname")"
+    newnum="$(( $(ls -d tests/* | sed 's|^[^/]*/\([0-9]*\)_.*|\1|' | sort -n | tail -n 1 | sed s/^0//) + 1))"
+    newname="$(printf "%02d_%s" "${newnum}" "$tname")"
 
     read -p "your new test will be named tests/$newname.  OK [Y/n]? "
@@ -20 +21 @@
 cp -a tests/00_basic "tests/$newname"
 
-printf "You can now edit %s\n" "$newname"
+# create run script for make check
+newscript="test-${newname}.bash"
+echo '#!/bin/bash' >"${newscript}"
+echo "make -f TestMakefile t-${newnum}" >>"${newscript}"
+chmod a+x "${newscript}"
+
+echo "You can now edit ${newname}."
+echo "When ready, add ${newscript} to TESTS in Makefile.am."

test/setup

@@ -13 +13 @@
 
 if [ . != "$(dirname "$0")" ]; then
-    printf "You should only run this mod-gnutls test suite from the t/ directory of the mod_gnutls source.\n" >&2
+    printf "You should only run this mod-gnutls test suite from the test/ directory of the mod_gnutls source.\n" >&2
     exit 1
 fi