From: Michal Sojka Date: Sat, 23 Aug 2008 21:12:00 +0000 (+0000) Subject: Fixed test functions to work under dash shell X-Git-Tag: v0.1-sssa~49 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/fa8038791f4b89ecf30144625af7c9bb4bcc203f Fixed test functions to work under dash shell darcs-hash:20080823211254-f2ef6-635eec55b952cde6ef665815133d0b487fcbd25a.gz --- diff --git a/tests/all_omk_subdirs/runtest-recurs-expanded b/tests/all_omk_subdirs/runtest-recurs-expanded index 6b6aae8..a034358 100755 --- a/tests/all_omk_subdirs/runtest-recurs-expanded +++ b/tests/all_omk_subdirs/runtest-recurs-expanded @@ -1,4 +1,4 @@ #!/bin/sh OP="=" -. test.inc +. ./test.inc diff --git a/tests/all_omk_subdirs/runtest-simply-expanded b/tests/all_omk_subdirs/runtest-simply-expanded index 907198c..7ceb323 100755 --- a/tests/all_omk_subdirs/runtest-simply-expanded +++ b/tests/all_omk_subdirs/runtest-simply-expanded @@ -1,4 +1,4 @@ #!/bin/sh OP=":=" -. test.inc +. ./test.inc diff --git a/tests/all_omk_subdirs/test.inc b/tests/all_omk_subdirs/test.inc index f9c7984..e596015 100755 --- a/tests/all_omk_subdirs/test.inc +++ b/tests/all_omk_subdirs/test.inc @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh touch config.omk-default echo "SUBDIRS $OP \$(ALL_OMK_SUBDIRS)" > Makefile.omk diff --git a/tests/automatic_subdirs/runtest b/tests/automatic_subdirs/runtest index 2e0823b..3ca43f4 100755 --- a/tests/automatic_subdirs/runtest +++ b/tests/automatic_subdirs/runtest @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh touch config.omk-default diff --git a/tests/extra_rules_subdirs/runtest b/tests/extra_rules_subdirs/runtest index 0f77cc2..dbff410 100755 --- a/tests/extra_rules_subdirs/runtest +++ b/tests/extra_rules_subdirs/runtest @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh touch config.omk-default diff --git a/tests/functions.sh b/tests/functions.sh index 7eb0c52..6962ed2 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -3,7 +3,7 @@ # Exit on first error set -e -function findup() { +findup() { local arg="$1" if test -z "$arg"; then return 1; fi @@ -20,12 +20,12 @@ function findup() { cd $wd } -function error() { +error() { echo $1 > _error exit 1 } -function canttest() { +canttest() { [ -f _canttest ] || echo $1 > _canttest exit 1 } diff --git a/tests/headers/files/runtest b/tests/headers/files/runtest index 5103a6d..7846b7f 100755 --- a/tests/headers/files/runtest +++ b/tests/headers/files/runtest @@ -1,6 +1,6 @@ #!/bin/sh -source ../../functions.sh +. ../../functions.sh touch config.omk-default make || exit 2 diff --git a/tests/headers/generated/runtest b/tests/headers/generated/runtest index f91e1cf..b970e93 100755 --- a/tests/headers/generated/runtest +++ b/tests/headers/generated/runtest @@ -1,6 +1,6 @@ #!/bin/sh -source ../../functions.sh +. ../../functions.sh make default-config || error "Can't run make default-config" make include-pass || error "Can't run make include-pass" diff --git a/tests/headers/generated/runtest-default-cflags b/tests/headers/generated/runtest-default-cflags index f11aa5d..737f006 100755 --- a/tests/headers/generated/runtest-default-cflags +++ b/tests/headers/generated/runtest-default-cflags @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -source ../../functions.sh +. ../../functions.sh make default-config || error default-config diff --git a/tests/headers/nonexising/runtest b/tests/headers/nonexising/runtest index 3b7b517..4ab6664 100755 --- a/tests/headers/nonexising/runtest +++ b/tests/headers/nonexising/runtest @@ -1,6 +1,6 @@ #!/bin/sh -source ../../functions.sh +. ../../functions.sh touch config.omk-default make || exit 0 # It is OK to fail because of missing header file diff --git a/tests/hooks/runtest b/tests/hooks/runtest index 07f6498..159238a 100755 --- a/tests/hooks/runtest +++ b/tests/hooks/runtest @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh make|tee make.log diff --git a/tests/omk_config/runtest b/tests/omk_config/runtest index 2eef4cc..995797b 100755 --- a/tests/omk_config/runtest +++ b/tests/omk_config/runtest @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh OUTPUT=$(make 2>&1) diff --git a/tests/programs/runtest-cflags b/tests/programs/runtest-cflags index b490883..11fcdb5 100755 --- a/tests/programs/runtest-cflags +++ b/tests/programs/runtest-cflags @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh touch config.omk-default echo "CFLAGS=-DNUMBER=123" > config.omk diff --git a/tests/programs/runtest-cflags-cmdline b/tests/programs/runtest-cflags-cmdline index f2a8705..cefe77c 100755 --- a/tests/programs/runtest-cflags-cmdline +++ b/tests/programs/runtest-cflags-cmdline @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh touch config.omk-default make CFLAGS="-DNONSENSE=abc -DNUMBER=123"||error "Can't compile" diff --git a/tests/programs/runtest-defs b/tests/programs/runtest-defs index d86ad0f..80ecc1a 100755 --- a/tests/programs/runtest-defs +++ b/tests/programs/runtest-defs @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh touch config.omk-default echo "DEFS=-DNUMBER=123" > config.omk diff --git a/tests/programs/runtest-test_PROGRAMS b/tests/programs/runtest-test_PROGRAMS index 72b4712..53b2f75 100755 --- a/tests/programs/runtest-test_PROGRAMS +++ b/tests/programs/runtest-test_PROGRAMS @@ -1,5 +1,5 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh touch config.omk-default rm -rf _compiled diff --git a/tests/qt/runtest b/tests/qt/runtest index 8fef771..4543537 100755 --- a/tests/qt/runtest +++ b/tests/qt/runtest @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh touch config.omk-default QTDIR=/usr/share/qt4 diff --git a/tests/whole_tree/runtest b/tests/whole_tree/runtest index 3925008..3c02c42 100755 --- a/tests/whole_tree/runtest +++ b/tests/whole_tree/runtest @@ -1,6 +1,6 @@ #!/bin/sh -source ../functions.sh +. ../functions.sh rm -f *.mark