Manually fix all_omk_subdirs test

diff --git a/tests/all_omk_subdirs/all_omk_subdirs-recurs-expanded b/tests/all_omk_subdirs/all_omk_subdirs-recurs-expanded
index a034358c9405a4608a1ce23b16918b2b1a993006..bbaef5d71417b9ccc2929f64a22948f2ab85a1bf 100755 (executable)
--- a/tests/all_omk_subdirs/all_omk_subdirs-recurs-expanded
+++ b/tests/all_omk_subdirs/all_omk_subdirs-recurs-expanded
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 OP="="
-. ./test.inc
+. ./all_omk_subdirs.inc

diff --git a/tests/all_omk_subdirs/all_omk_subdirs-simply-expanded b/tests/all_omk_subdirs/all_omk_subdirs-simply-expanded
index 7ceb323eeee69b3315476cb822060eda2fc2d184..563511f9b367294286e332a571dab714d07d1c61 100755 (executable)
--- a/tests/all_omk_subdirs/all_omk_subdirs-simply-expanded
+++ b/tests/all_omk_subdirs/all_omk_subdirs-simply-expanded
@@ -1,4 +1,4 @@
-#!/bin/sh
-
-OP=":="
-. ./test.inc
+#!/bin/sh\r
+\r
+OP=":="\r
+. ./all_omk_subdirs.inc\r

diff --git a/tests/all_omk_subdirs/test.inc b/tests/all_omk_subdirs/all_omk_subdirs.inc
similarity index 100%
rename from tests/all_omk_subdirs/test.inc
rename to tests/all_omk_subdirs/all_omk_subdirs.inc

diff --git a/tests/automatic_subdirs/automatic_subdirs b/tests/automatic_subdirs/automatic_subdirs
index 3ca43f408298a21c5b702dadcf58a350886a09e9..94763f664ea08732da035575c89d7ddac9f61032 100755 (executable)
--- a/tests/automatic_subdirs/automatic_subdirs
+++ b/tests/automatic_subdirs/automatic_subdirs
@@ -1,12 +1,12 @@
-#!/bin/sh
-
-. ../functions.sh
-
-touch config.omk-default
-
-OUTPUT=$(make 2>&1) || canttest
-echo $OUTPUT | grep make-in-dir1 || error "Make was not called in dir1" 
-echo $OUTPUT | grep make-in-dir2 || error "Make was not called in dir2"
-echo $OUTPUT | grep make-in-dir3 && error "Make shouldn't be called in dir3" 
-
-exit 0
+#!/bin/sh\r
+\r
+. ../functions.sh\r
+\r
+touch config.omk-default\r
+\r
+OUTPUT=$(make 2>&1) || canttest\r
+echo $OUTPUT | grep make-in-dir1 || error "Make was not called in dir1" \r
+echo $OUTPUT | grep make-in-dir2 || error "Make was not called in dir2"\r
+echo $OUTPUT | grep make-in-dir3 && error "Make shouldn't be called in dir3" \r
+\r
+exit 0\r