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 6b6aae824570b7f2b103a775f48d0219fc6b5d57..a034358c9405a4608a1ce23b16918b2b1a993006 100755 (executable)
--- 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 907198c2112e0927eb638bec8b8cdd256bd10a89..7ceb323eeee69b3315476cb822060eda2fc2d184 100755 (executable)
--- 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 f9c7984fa803ce8b1ce5fd67ca77f4d81b2c506f..e5960157b71396b221598ec69ecf9815ed784872 100755 (executable)
--- 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 2e0823b24948c204a2c4493fa9a769d910033423..3ca43f408298a21c5b702dadcf58a350886a09e9 100755 (executable)
--- 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 0f77cc2a13fe4313f3471e28355e15ca0806c70a..dbff4105a8f5efc849c2728ab4cab90c0ca470ce 100755 (executable)
--- 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 7eb0c5215842e29e4dc74c71ecf8bf846d2f89ac..6962ed26818a71a350533dd136398c445706e77d 100644 (file)
--- 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 5103a6d5110adfc943af290bdf4b295101074dfa..7846b7f641809df196f508da82791d7f09d77507 100755 (executable)
--- 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 f91e1cf103d51c4ea6e57a73b4f940367e7f59ef..b970e93eb9a7228c5601956ca779543de301db1e 100755 (executable)
--- 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 f11aa5de24b5acd491ea06b180e56002fe0c9872..737f006519fae6c5e469d16b7e509979e32b33ef 100755 (executable)
--- 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 3b7b517fb9823964ef2b9f2244bfad064af2b613..4ab66641fcfd88d50215c68b07c66922de517710 100755 (executable)
--- 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 07f6498ce9ced4afa1cd3d561e79fd4270011861..159238a4e7b73770f4397c3832e4ec1428d8dea5 100755 (executable)
--- 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 2eef4cc947f448c6b89cfbc8178ed2b0a0969530..995797b712bcad3b8dc964d0a1288584de86a7d8 100755 (executable)
--- 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 b4908830fdba7a7d1d5d18b3fbe23ad815b804c5..11fcdb5585115bea7ce3bbbfaaa295ec3339dc63 100755 (executable)
--- 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 f2a870577bdefc6607a6feae997b17724b71096a..cefe77c6418a541129aeeca345920f3df1621b60 100755 (executable)
--- 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 d86ad0f404a68270768aec543b9e4124a4aaba7c..80ecc1ab60b83b1d975e94c474af0bcd93d8c1e6 100755 (executable)
--- 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 72b47128e118f6bb8095cbe9436f88d8ac00b1f4..53b2f759ab9be4835655f6a360ffbecbcd2ccc17 100755 (executable)
--- 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 8fef771c82d7bad24555684863b1bb3e2f4f49ed..45435374c5f571ac47a632dcad745191c19fbf4c 100755 (executable)
--- 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 39250087a3d0f186b351f06e5d2ff063817b4794..3c02c426b6891bef21682f3262438fe691817491 100755 (executable)
--- a/tests/whole_tree/runtest
+++ b/tests/whole_tree/runtest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-source ../functions.sh
+. ../functions.sh
 
 rm -f *.mark