diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-11-27 14:21:01 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-12-02 12:19:29 +0000 |
commit | 0d24e380ff394782358da99b776a187d402142e9 (patch) | |
tree | 895f2fe3efe4c524cd6ed0f65a4ce7c24c0cb267 /check | |
parent | c8f97d36441ce8e0bd18feba8073f32a2b1c4628 (diff) | |
download | morph-0d24e380ff394782358da99b776a187d402142e9.tar.gz |
Convert last cmdtests to yarns
The conversion was made so that the build command was used instead of
the build-morphology command.
Change-Id: I67c43d765ed603ecdd806bc649815526243b7b87
Diffstat (limited to 'check')
-rwxr-xr-x | check | 38 |
1 files changed, 1 insertions, 37 deletions
@@ -24,24 +24,16 @@ set -e run_style=false run_unit_tests=false -run_cmdtests=false run_yarns=false snapshot='' if [ "$#" -eq 0 ]; then run_style=true run_unit_tests=true - run_cmdtests=true run_yarns=true fi while [ "$#" -gt 0 ] do case "$1" in - --full) - run_style=true - run_unit_tests=true - run_cmdtests=true - run_yarns=true - ;; --style) run_style=true ;; @@ -54,12 +46,6 @@ do --no-unit-tests) run_unit_tests=false ;; - --cmdtests) - run_cmdtests=true - ;; - --no-cmdtests) - run_cmdtests=false - ;; --yarns) run_yarns=true ;; @@ -126,8 +112,7 @@ then if ! (git ls-files --cached | grep -v '\.gz$' | grep -v '\.json-schema$' | - grep -Ev 'tests[^/]*/.*\.std(out|err)' | - grep -vF 'tests.build/build-system-autotools.script' | + grep -v 'yarns/xfce-system-dependencies' | xargs -r scripts/check-silliness); then exit 1 fi @@ -159,24 +144,3 @@ then --tempdir "$TMPDIR" -s yarns/morph.shell-lib \ yarns/*.yarn fi - -# cmdtest tests. - -HOME="$(pwd)/scripts" - -if "$run_cmdtests" -then - cmdtest tests -else - echo "NOT RUNNING test" -fi - -# Building systems requires the 'filter' parameter of tarfile.TarFile.add(): -# this was introduced in Python 2.7 -if ! "$run_cmdtests"; then - echo "NOT RUNNING tests.build" -elif ! (python --version 2>&1 | grep -q '^Python 2\.[78]'); then - echo "NOT RUNNING tests.build (requires Python 2.7)" -else - cmdtest tests.build -fi |