From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 20 Nov 2014 06:57:49 +0000 (+0100)
Subject: Merge pull request #27 from eepp/various-fixes
X-Git-Url: https://git.efficios.com/?a=commitdiff_plain;h=7ea61b80d99f31b71982633eee99708ee9b89907;hp=6fe5adb276875a59e8767f43ee7506adf7da8be1;p=ctf-testsuite.git

Merge pull request #27 from eepp/various-fixes

Various fixes
---

diff --git a/README b/README
deleted file mode 100644
index 52b8fa2..0000000
--- a/README
+++ /dev/null
@@ -1,9 +0,0 @@
-ctf-testsuite
-=============
-
-The Common Trace Format (CTF) testsuite is intended to validate the
-conformance of CTF readers.
-
-To run the testsuite simply export CTF_READER_BIN="$YOUR_CTF_READER" and
-use the run.sh script found in the tests/x.y/ folder, x.y being the CTF
-specification version you want to check.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..52fabe8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,21 @@
+ctf-testsuite
+=============
+
+The Common Trace Format (CTF) test suite is intended to validate the
+conformance of CTF readers.
+
+To run the test suite:
+
+  1. Set the `CTF_READER_BIN` environment variable to your CTF reader
+    executable, e.g.:
+
+        export CTF_READER_BIN=my-ctf-reader
+
+  2. Execute the `run.sh` script found in the `tests/x.y` directory,
+     where `x.y` is the CTF specification's version you want to check,
+     e.g.:
+
+        ( cd tests/1.8 && ./run.sh )
+
+You may also set the `CTF_READER_OPTS` environment variable to options
+to pass to the CTF reader defined by `CTF_READER_BIN`.
diff --git a/tests/1.8/fuzzing/run.sh b/tests/1.8/fuzzing/run.sh
index d535ef1..9b3a392 100755
--- a/tests/1.8/fuzzing/run.sh
+++ b/tests/1.8/fuzzing/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for dir in $(find -mindepth 1 -maxdepth 1 -type d); do
+for dir in $(find -mindepth 1 -maxdepth 1 -type d | sort); do
 	echo "Running ${dir} tests"
 	cd ${dir}
 	./run.sh
diff --git a/tests/1.8/regression/metadata/run.sh b/tests/1.8/regression/metadata/run.sh
index d535ef1..9b3a392 100755
--- a/tests/1.8/regression/metadata/run.sh
+++ b/tests/1.8/regression/metadata/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for dir in $(find -mindepth 1 -maxdepth 1 -type d); do
+for dir in $(find -mindepth 1 -maxdepth 1 -type d | sort); do
 	echo "Running ${dir} tests"
 	cd ${dir}
 	./run.sh
diff --git a/tests/1.8/regression/run.sh b/tests/1.8/regression/run.sh
index d535ef1..9b3a392 100755
--- a/tests/1.8/regression/run.sh
+++ b/tests/1.8/regression/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for dir in $(find -mindepth 1 -maxdepth 1 -type d); do
+for dir in $(find -mindepth 1 -maxdepth 1 -type d | sort); do
 	echo "Running ${dir} tests"
 	cd ${dir}
 	./run.sh
diff --git a/tests/1.8/regression/stream/run.sh b/tests/1.8/regression/stream/run.sh
index d535ef1..9b3a392 100755
--- a/tests/1.8/regression/stream/run.sh
+++ b/tests/1.8/regression/stream/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for dir in $(find -mindepth 1 -maxdepth 1 -type d); do
+for dir in $(find -mindepth 1 -maxdepth 1 -type d | sort); do
 	echo "Running ${dir} tests"
 	cd ${dir}
 	./run.sh
diff --git a/tests/1.8/run.sh b/tests/1.8/run.sh
index d535ef1..9b3a392 100755
--- a/tests/1.8/run.sh
+++ b/tests/1.8/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for dir in $(find -mindepth 1 -maxdepth 1 -type d); do
+for dir in $(find -mindepth 1 -maxdepth 1 -type d | sort); do
 	echo "Running ${dir} tests"
 	cd ${dir}
 	./run.sh
diff --git a/tests/1.8/stress/metadata/run.sh b/tests/1.8/stress/metadata/run.sh
index d535ef1..9b3a392 100755
--- a/tests/1.8/stress/metadata/run.sh
+++ b/tests/1.8/stress/metadata/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for dir in $(find -mindepth 1 -maxdepth 1 -type d); do
+for dir in $(find -mindepth 1 -maxdepth 1 -type d | sort); do
 	echo "Running ${dir} tests"
 	cd ${dir}
 	./run.sh
diff --git a/tests/1.8/stress/run.sh b/tests/1.8/stress/run.sh
index d535ef1..9b3a392 100755
--- a/tests/1.8/stress/run.sh
+++ b/tests/1.8/stress/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for dir in $(find -mindepth 1 -maxdepth 1 -type d); do
+for dir in $(find -mindepth 1 -maxdepth 1 -type d | sort); do
 	echo "Running ${dir} tests"
 	cd ${dir}
 	./run.sh
diff --git a/tests/1.8/stress/stream/run.sh b/tests/1.8/stress/stream/run.sh
index d535ef1..9b3a392 100755
--- a/tests/1.8/stress/stream/run.sh
+++ b/tests/1.8/stress/stream/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for dir in $(find -mindepth 1 -maxdepth 1 -type d); do
+for dir in $(find -mindepth 1 -maxdepth 1 -type d | sort); do
 	echo "Running ${dir} tests"
 	cd ${dir}
 	./run.sh
diff --git a/utils/run.sh b/utils/run.sh
index 93482d9..c5a1db5 100755
--- a/utils/run.sh
+++ b/utils/run.sh
@@ -2,11 +2,11 @@
 
 TEST_PROG="./test.sh"
 
-for t in */; do
+for t in $(find -mindepth 1 -maxdepth 1 -type d | sort); do
 	if [ -n "${TEST_LIST}" ]; then
 		TEST_LIST="${TEST_LIST}\n"
 	fi
 	TEST_LIST="${TEST_LIST}./test.sh ${t}"
 done
 
-echo "${TEST_LIST}" | prove --exec '' --merge -
+echo -e "${TEST_LIST}" | prove --exec '' --merge -