summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Kuzminsky <seb@highlab.com>2008-11-12 15:20:55 +0000
committerSebastian Kuzminsky <seb@highlab.com>2008-11-12 15:20:55 +0000
commit99f7c7e439490bacd1f4432c173b13f2721214c6 (patch)
tree77846b1d80e7264a4266e47996f84d3d0da4d713
parent57fdeafeb5469b44252041c089d634d37f511dc1 (diff)
downloadlinuxcnc-99f7c7e439490bacd1f4432c173b13f2721214c6.tar.gz
linuxcnc-99f7c7e439490bacd1f4432c173b13f2721214c6.zip
both test.hal and test.sh indicate a valid test
-rw-r--r--tests/README14
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/README b/tests/README
index d8f9ab90b..e8a4a55e7 100644
--- a/tests/README
+++ b/tests/README
@@ -30,8 +30,8 @@ can be run by executing (from the top emc2 directory)
A subset of the tests can also be run:
scripts/runtests tests/xyz tests/a*
The directories named on the commandline are searched recursively for
-'test.hal' files, and a directory with such a file is assumed to contain a
-regression test or a functional test.
+'test.hal' or 'test.sh' files, and a directory with such a file is
+assumed to contain a regression test or a functional test.
Tests may contain files other than the ones specified below. For instance,
when using 'streamer' data as test input, a shell script with
@@ -43,8 +43,9 @@ Regression Tests
A regression test should consist of these three files:
README
A human-readable file describing the test
- test.hal
- A script that will be executed with halrun -f
+ test.hal *or* test.sh
+ The test script to execute. test.hal is executed with
+ 'halrun -f', test.sh is executed with 'bash -x'
expected
A file whose contents are compared with the stdout of
halrun -f test.hal
@@ -68,8 +69,9 @@ Functional Tests
A functional test should consist of three files:
README
A human-readable file describing the test
- test.hal
- A script that will be executed with halrun -f
+ test.hal *or* test.sh
+ The test script to execute. test.hal is executed with
+ 'halrun -f', test.sh is executed with 'bash -x'
checkresult
An executable file (such as a shell or python script)
which determines if the stdout of