diff options
| author | Sebastian Kuzminsky <seb@highlab.com> | 2012-12-14 22:13:17 -0700 |
|---|---|---|
| committer | Sebastian Kuzminsky <seb@highlab.com> | 2012-12-14 23:08:27 -0700 |
| commit | 94c8a868db6c22083b220a5d83a03f69c4d9812b (patch) | |
| tree | 655401f4f5373e76688c60ee366abb6f7cf3acce | |
| parent | 15e7562936bcd41851364ee2d76d02bca0aedf72 (diff) | |
| download | linuxcnc-94c8a868db6c22083b220a5d83a03f69c4d9812b.tar.gz linuxcnc-94c8a868db6c22083b220a5d83a03f69c4d9812b.zip | |
reorg module loading test to make room for more modules
59 files changed, 31 insertions, 31 deletions
diff --git a/tests/encoder/1-names/ENCODER_NAME_REGEX b/tests/encoder/1-names/ENCODER_NAME_REGEX deleted file mode 100644 index 92496c255..000000000 --- a/tests/encoder/1-names/ENCODER_NAME_REGEX +++ /dev/null @@ -1 +0,0 @@ -enc[0-9] diff --git a/tests/encoder/1-names/test.sh b/tests/encoder/1-names/test.sh deleted file mode 120000 index 0b01664e6..000000000 --- a/tests/encoder/1-names/test.sh +++ /dev/null @@ -1 +0,0 @@ -../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/8-names/ENCODER_NAME_REGEX b/tests/encoder/8-names/ENCODER_NAME_REGEX deleted file mode 100644 index 92496c255..000000000 --- a/tests/encoder/8-names/ENCODER_NAME_REGEX +++ /dev/null @@ -1 +0,0 @@ -enc[0-9] diff --git a/tests/encoder/8-names/test.sh b/tests/encoder/8-names/test.sh deleted file mode 120000 index 0b01664e6..000000000 --- a/tests/encoder/8-names/test.sh +++ /dev/null @@ -1 +0,0 @@ -../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/9-names/ENCODER_NAME_REGEX b/tests/encoder/9-names/ENCODER_NAME_REGEX deleted file mode 100644 index 92496c255..000000000 --- a/tests/encoder/9-names/ENCODER_NAME_REGEX +++ /dev/null @@ -1 +0,0 @@ -enc[0-9] diff --git a/tests/encoder/9-names/test.sh b/tests/encoder/9-names/test.sh deleted file mode 120000 index 0b01664e6..000000000 --- a/tests/encoder/9-names/test.sh +++ /dev/null @@ -1 +0,0 @@ -../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/num_chan=0/ENCODER_NAME_REGEX b/tests/encoder/num_chan=0/ENCODER_NAME_REGEX deleted file mode 100644 index e573a7b5a..000000000 --- a/tests/encoder/num_chan=0/ENCODER_NAME_REGEX +++ /dev/null @@ -1 +0,0 @@ -encoder\.[0-9] diff --git a/tests/encoder/num_chan=0/test.sh b/tests/encoder/num_chan=0/test.sh deleted file mode 120000 index 0b01664e6..000000000 --- a/tests/encoder/num_chan=0/test.sh +++ /dev/null @@ -1 +0,0 @@ -../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/num_chan=1/ENCODER_NAME_REGEX b/tests/encoder/num_chan=1/ENCODER_NAME_REGEX deleted file mode 100644 index e573a7b5a..000000000 --- a/tests/encoder/num_chan=1/ENCODER_NAME_REGEX +++ /dev/null @@ -1 +0,0 @@ -encoder\.[0-9] diff --git a/tests/encoder/num_chan=1/test.sh b/tests/encoder/num_chan=1/test.sh deleted file mode 120000 index 0b01664e6..000000000 --- a/tests/encoder/num_chan=1/test.sh +++ /dev/null @@ -1 +0,0 @@ -../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/num_chan=8/ENCODER_NAME_REGEX b/tests/encoder/num_chan=8/ENCODER_NAME_REGEX deleted file mode 100644 index e573a7b5a..000000000 --- a/tests/encoder/num_chan=8/ENCODER_NAME_REGEX +++ /dev/null @@ -1 +0,0 @@ -encoder\.[0-9] diff --git a/tests/encoder/num_chan=8/test.sh b/tests/encoder/num_chan=8/test.sh deleted file mode 120000 index 0b01664e6..000000000 --- a/tests/encoder/num_chan=8/test.sh +++ /dev/null @@ -1 +0,0 @@ -../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/num_chan=9/ENCODER_NAME_REGEX b/tests/encoder/num_chan=9/ENCODER_NAME_REGEX deleted file mode 100644 index e573a7b5a..000000000 --- a/tests/encoder/num_chan=9/ENCODER_NAME_REGEX +++ /dev/null @@ -1 +0,0 @@ -encoder\.[0-9] diff --git a/tests/encoder/num_chan=9/test.sh b/tests/encoder/num_chan=9/test.sh deleted file mode 120000 index 0b01664e6..000000000 --- a/tests/encoder/num_chan=9/test.sh +++ /dev/null @@ -1 +0,0 @@ -../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/shared-test.sh b/tests/encoder/shared-test.sh deleted file mode 100644 index ff2432341..000000000 --- a/tests/encoder/shared-test.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -halrun setup.hal > hal-output 2>&1 -RESULT=$? - -NUM_ENCODERS=$(cat hal-output | grep $(cat ENCODER_NAME_REGEX)'\.position$' | wc -l) - -if [ $RESULT -ne $(cat RESULT) ]; then - exit 1 -fi - -if [ "$NUM_ENCODERS" -ne $(cat NUM_ENCODERS) ]; then - exit 1 -fi - -exit 0 - diff --git a/tests/encoder/.gitignore b/tests/module-loading/.gitignore index 4255ca756..4255ca756 100644 --- a/tests/encoder/.gitignore +++ b/tests/module-loading/.gitignore diff --git a/tests/encoder/1-names/NUM_ENCODERS b/tests/module-loading/encoder/1-names/NUM_PINS index d00491fd7..d00491fd7 100644 --- a/tests/encoder/1-names/NUM_ENCODERS +++ b/tests/module-loading/encoder/1-names/NUM_PINS diff --git a/tests/module-loading/encoder/1-names/PIN_NAME_REGEX b/tests/module-loading/encoder/1-names/PIN_NAME_REGEX new file mode 100644 index 000000000..2e8db0d39 --- /dev/null +++ b/tests/module-loading/encoder/1-names/PIN_NAME_REGEX @@ -0,0 +1 @@ +enc[0-9]\.position$ diff --git a/tests/encoder/1-names/RESULT b/tests/module-loading/encoder/1-names/RESULT index 573541ac9..573541ac9 100644 --- a/tests/encoder/1-names/RESULT +++ b/tests/module-loading/encoder/1-names/RESULT diff --git a/tests/encoder/1-names/expected b/tests/module-loading/encoder/1-names/expected index e69de29bb..e69de29bb 100644 --- a/tests/encoder/1-names/expected +++ b/tests/module-loading/encoder/1-names/expected diff --git a/tests/encoder/1-names/setup.hal b/tests/module-loading/encoder/1-names/setup.hal index 37681c688..37681c688 100644 --- a/tests/encoder/1-names/setup.hal +++ b/tests/module-loading/encoder/1-names/setup.hal diff --git a/tests/module-loading/encoder/1-names/test.sh b/tests/module-loading/encoder/1-names/test.sh new file mode 120000 index 000000000..d6b8aae97 --- /dev/null +++ b/tests/module-loading/encoder/1-names/test.sh @@ -0,0 +1 @@ +../../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/8-names/NUM_ENCODERS b/tests/module-loading/encoder/8-names/NUM_PINS index 45a4fb75d..45a4fb75d 100644 --- a/tests/encoder/8-names/NUM_ENCODERS +++ b/tests/module-loading/encoder/8-names/NUM_PINS diff --git a/tests/module-loading/encoder/8-names/PIN_NAME_REGEX b/tests/module-loading/encoder/8-names/PIN_NAME_REGEX new file mode 100644 index 000000000..2e8db0d39 --- /dev/null +++ b/tests/module-loading/encoder/8-names/PIN_NAME_REGEX @@ -0,0 +1 @@ +enc[0-9]\.position$ diff --git a/tests/encoder/8-names/RESULT b/tests/module-loading/encoder/8-names/RESULT index 573541ac9..573541ac9 100644 --- a/tests/encoder/8-names/RESULT +++ b/tests/module-loading/encoder/8-names/RESULT diff --git a/tests/encoder/8-names/expected b/tests/module-loading/encoder/8-names/expected index e69de29bb..e69de29bb 100644 --- a/tests/encoder/8-names/expected +++ b/tests/module-loading/encoder/8-names/expected diff --git a/tests/encoder/8-names/setup.hal b/tests/module-loading/encoder/8-names/setup.hal index ffcfa46c6..ffcfa46c6 100644 --- a/tests/encoder/8-names/setup.hal +++ b/tests/module-loading/encoder/8-names/setup.hal diff --git a/tests/module-loading/encoder/8-names/test.sh b/tests/module-loading/encoder/8-names/test.sh new file mode 120000 index 000000000..d6b8aae97 --- /dev/null +++ b/tests/module-loading/encoder/8-names/test.sh @@ -0,0 +1 @@ +../../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/9-names/NUM_ENCODERS b/tests/module-loading/encoder/9-names/NUM_PINS index 573541ac9..573541ac9 100644 --- a/tests/encoder/9-names/NUM_ENCODERS +++ b/tests/module-loading/encoder/9-names/NUM_PINS diff --git a/tests/module-loading/encoder/9-names/PIN_NAME_REGEX b/tests/module-loading/encoder/9-names/PIN_NAME_REGEX new file mode 100644 index 000000000..2e8db0d39 --- /dev/null +++ b/tests/module-loading/encoder/9-names/PIN_NAME_REGEX @@ -0,0 +1 @@ +enc[0-9]\.position$ diff --git a/tests/encoder/9-names/RESULT b/tests/module-loading/encoder/9-names/RESULT index d00491fd7..d00491fd7 100644 --- a/tests/encoder/9-names/RESULT +++ b/tests/module-loading/encoder/9-names/RESULT diff --git a/tests/encoder/9-names/expected b/tests/module-loading/encoder/9-names/expected index e69de29bb..e69de29bb 100644 --- a/tests/encoder/9-names/expected +++ b/tests/module-loading/encoder/9-names/expected diff --git a/tests/encoder/9-names/setup.hal b/tests/module-loading/encoder/9-names/setup.hal index 44e893a94..44e893a94 100644 --- a/tests/encoder/9-names/setup.hal +++ b/tests/module-loading/encoder/9-names/setup.hal diff --git a/tests/module-loading/encoder/9-names/test.sh b/tests/module-loading/encoder/9-names/test.sh new file mode 120000 index 000000000..d6b8aae97 --- /dev/null +++ b/tests/module-loading/encoder/9-names/test.sh @@ -0,0 +1 @@ +../../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/num_chan=0/NUM_ENCODERS b/tests/module-loading/encoder/num_chan=0/NUM_PINS index 00750edc0..00750edc0 100644 --- a/tests/encoder/num_chan=0/NUM_ENCODERS +++ b/tests/module-loading/encoder/num_chan=0/NUM_PINS diff --git a/tests/module-loading/encoder/num_chan=0/PIN_NAME_REGEX b/tests/module-loading/encoder/num_chan=0/PIN_NAME_REGEX new file mode 100644 index 000000000..924d37d6a --- /dev/null +++ b/tests/module-loading/encoder/num_chan=0/PIN_NAME_REGEX @@ -0,0 +1 @@ +encoder\.[0-9]\.position$ diff --git a/tests/encoder/num_chan=0/RESULT b/tests/module-loading/encoder/num_chan=0/RESULT index 573541ac9..573541ac9 100644 --- a/tests/encoder/num_chan=0/RESULT +++ b/tests/module-loading/encoder/num_chan=0/RESULT diff --git a/tests/encoder/num_chan=0/expected b/tests/module-loading/encoder/num_chan=0/expected index e69de29bb..e69de29bb 100644 --- a/tests/encoder/num_chan=0/expected +++ b/tests/module-loading/encoder/num_chan=0/expected diff --git a/tests/encoder/num_chan=0/setup.hal b/tests/module-loading/encoder/num_chan=0/setup.hal index c43ce0ffe..c43ce0ffe 100644 --- a/tests/encoder/num_chan=0/setup.hal +++ b/tests/module-loading/encoder/num_chan=0/setup.hal diff --git a/tests/module-loading/encoder/num_chan=0/test.sh b/tests/module-loading/encoder/num_chan=0/test.sh new file mode 120000 index 000000000..d6b8aae97 --- /dev/null +++ b/tests/module-loading/encoder/num_chan=0/test.sh @@ -0,0 +1 @@ +../../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/num_chan=1/NUM_ENCODERS b/tests/module-loading/encoder/num_chan=1/NUM_PINS index d00491fd7..d00491fd7 100644 --- a/tests/encoder/num_chan=1/NUM_ENCODERS +++ b/tests/module-loading/encoder/num_chan=1/NUM_PINS diff --git a/tests/module-loading/encoder/num_chan=1/PIN_NAME_REGEX b/tests/module-loading/encoder/num_chan=1/PIN_NAME_REGEX new file mode 100644 index 000000000..924d37d6a --- /dev/null +++ b/tests/module-loading/encoder/num_chan=1/PIN_NAME_REGEX @@ -0,0 +1 @@ +encoder\.[0-9]\.position$ diff --git a/tests/encoder/num_chan=1/RESULT b/tests/module-loading/encoder/num_chan=1/RESULT index 573541ac9..573541ac9 100644 --- a/tests/encoder/num_chan=1/RESULT +++ b/tests/module-loading/encoder/num_chan=1/RESULT diff --git a/tests/encoder/num_chan=1/expected b/tests/module-loading/encoder/num_chan=1/expected index e69de29bb..e69de29bb 100644 --- a/tests/encoder/num_chan=1/expected +++ b/tests/module-loading/encoder/num_chan=1/expected diff --git a/tests/encoder/num_chan=1/setup.hal b/tests/module-loading/encoder/num_chan=1/setup.hal index 851536dfd..851536dfd 100644 --- a/tests/encoder/num_chan=1/setup.hal +++ b/tests/module-loading/encoder/num_chan=1/setup.hal diff --git a/tests/module-loading/encoder/num_chan=1/test.sh b/tests/module-loading/encoder/num_chan=1/test.sh new file mode 120000 index 000000000..d6b8aae97 --- /dev/null +++ b/tests/module-loading/encoder/num_chan=1/test.sh @@ -0,0 +1 @@ +../../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/num_chan=8/NUM_ENCODERS b/tests/module-loading/encoder/num_chan=8/NUM_PINS index 45a4fb75d..45a4fb75d 100644 --- a/tests/encoder/num_chan=8/NUM_ENCODERS +++ b/tests/module-loading/encoder/num_chan=8/NUM_PINS diff --git a/tests/module-loading/encoder/num_chan=8/PIN_NAME_REGEX b/tests/module-loading/encoder/num_chan=8/PIN_NAME_REGEX new file mode 100644 index 000000000..924d37d6a --- /dev/null +++ b/tests/module-loading/encoder/num_chan=8/PIN_NAME_REGEX @@ -0,0 +1 @@ +encoder\.[0-9]\.position$ diff --git a/tests/encoder/num_chan=8/RESULT b/tests/module-loading/encoder/num_chan=8/RESULT index 573541ac9..573541ac9 100644 --- a/tests/encoder/num_chan=8/RESULT +++ b/tests/module-loading/encoder/num_chan=8/RESULT diff --git a/tests/encoder/num_chan=8/expected b/tests/module-loading/encoder/num_chan=8/expected index e69de29bb..e69de29bb 100644 --- a/tests/encoder/num_chan=8/expected +++ b/tests/module-loading/encoder/num_chan=8/expected diff --git a/tests/encoder/num_chan=8/setup.hal b/tests/module-loading/encoder/num_chan=8/setup.hal index 474d6ffec..474d6ffec 100644 --- a/tests/encoder/num_chan=8/setup.hal +++ b/tests/module-loading/encoder/num_chan=8/setup.hal diff --git a/tests/module-loading/encoder/num_chan=8/test.sh b/tests/module-loading/encoder/num_chan=8/test.sh new file mode 120000 index 000000000..d6b8aae97 --- /dev/null +++ b/tests/module-loading/encoder/num_chan=8/test.sh @@ -0,0 +1 @@ +../../shared-test.sh
\ No newline at end of file diff --git a/tests/encoder/num_chan=9/NUM_ENCODERS b/tests/module-loading/encoder/num_chan=9/NUM_PINS index 573541ac9..573541ac9 100644 --- a/tests/encoder/num_chan=9/NUM_ENCODERS +++ b/tests/module-loading/encoder/num_chan=9/NUM_PINS diff --git a/tests/module-loading/encoder/num_chan=9/PIN_NAME_REGEX b/tests/module-loading/encoder/num_chan=9/PIN_NAME_REGEX new file mode 100644 index 000000000..924d37d6a --- /dev/null +++ b/tests/module-loading/encoder/num_chan=9/PIN_NAME_REGEX @@ -0,0 +1 @@ +encoder\.[0-9]\.position$ diff --git a/tests/encoder/num_chan=9/RESULT b/tests/module-loading/encoder/num_chan=9/RESULT index d00491fd7..d00491fd7 100644 --- a/tests/encoder/num_chan=9/RESULT +++ b/tests/module-loading/encoder/num_chan=9/RESULT diff --git a/tests/encoder/num_chan=9/expected b/tests/module-loading/encoder/num_chan=9/expected index e69de29bb..e69de29bb 100644 --- a/tests/encoder/num_chan=9/expected +++ b/tests/module-loading/encoder/num_chan=9/expected diff --git a/tests/encoder/num_chan=9/setup.hal b/tests/module-loading/encoder/num_chan=9/setup.hal index 221dab54f..221dab54f 100644 --- a/tests/encoder/num_chan=9/setup.hal +++ b/tests/module-loading/encoder/num_chan=9/setup.hal diff --git a/tests/module-loading/encoder/num_chan=9/test.sh b/tests/module-loading/encoder/num_chan=9/test.sh new file mode 120000 index 000000000..d6b8aae97 --- /dev/null +++ b/tests/module-loading/encoder/num_chan=9/test.sh @@ -0,0 +1 @@ +../../shared-test.sh
\ No newline at end of file diff --git a/tests/module-loading/shared-test.sh b/tests/module-loading/shared-test.sh new file mode 100644 index 000000000..94a28c1a1 --- /dev/null +++ b/tests/module-loading/shared-test.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +halrun setup.hal > hal-output 2>&1 +RESULT=$? + +NUM_PINS=$(cat hal-output | egrep $(cat PIN_NAME_REGEX) | wc -l) + +if [ $RESULT -ne $(cat RESULT) ]; then + exit 1 +fi + +if [ "$NUM_PINS" -ne $(cat NUM_PINS) ]; then + exit 1 +fi + +exit 0 + |