Changeset 623

Timestamp:

08/22/10 04:27:19 (1 year ago)

Author:

braddr

Message:

Add support for custom post-test scripts.
Add a test that uses -profile and validate that it emits the correct .def file and at least something in the .log file

Files:

• trunk/test/Makefile (modified) (1 diff)
• trunk/test/do_test.sh (modified) (2 diffs)
• trunk/test/runnable/extra-files/hello-profile-postscript.sh (added)
• trunk/test/runnable/extra-files/hello-profile.d.trace.def (added)
• trunk/test/runnable/hello-profile.d (added)

trunk/test/Makefile

@@ -30 +30 @@
-#   PERMUTE_ARGS:        the set of arguments to permute in multiple $(DMD) invocations
-#                        default: the make variable ARGS (see below)
+#
+#   POST_SCRIPT:         name of script to execute after test run
+#                        default: (none)
-#
-#   REQUIRED_ARGS:       arguments to add to the $(DMD) command line

trunk/test/do_test.sh

@@ -53 +53 @@
-grep -q COMPILE_SEPARATELY ${input_file}
-separate=$?
+
+post_script=`grep POST_SCRIPT ${input_file} | tr -d \\\\r\\\\n`
+if [ ! -z "${post_script}" ]; then
+    post_script="${post_script/*POST_SCRIPT:*( )/}"
+fi
-
-if [ "${input_dir}" != "runnable" ]; then
@@ -113 +118 @@
-    fi
-
+    if [ ! -z ${post_script} ]; then
+        echo "Executing post-test script: ${post_script}" >> ${output_file}
+        ${post_script} >> ${output_file} 2>&1
+        if [ $? -ne 0 ]; then
+            cat ${output_file}
+            rm -f ${output_file}
+            exit 1
+        fi
+    fi
+
-    rm -f ${test_app} ${test_app}.o ${ofiles[*]}
-