diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:29:33 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:29:33 +0000 |
| commit | aa057c097f450f07f14f867506cbaafbfbfacce9 (patch) | |
| tree | ea5b4502b3f8cf4042e848540b7cb48cdcbc9484 /dmake | |
| parent | 2c058276826d3633f437f36e3f866653a3ca8385 (diff) | |
INTEGRATION: CWS dmake45 (1.2.2); FILE MERGED
2006/06/22 20:45:44 vq 1.2.2.1: #i66650# Make dmake testsuite more portable. (Usable with Solaris.)
Patch by hjs.
Diffstat (limited to 'dmake')
| -rwxr-xr-x | dmake/tests/misc-5 | 2 | ||||
| -rwxr-xr-x | dmake/tests/misc-7 | 2 | ||||
| -rwxr-xr-x | dmake/tests/misc-8 | 2 | ||||
| -rwxr-xr-x | dmake/tests/misc-9 | 2 | ||||
| -rwxr-xr-x | dmake/tests/recipes-1 | 5 |
5 files changed, 7 insertions, 6 deletions
diff --git a/dmake/tests/misc-5 b/dmake/tests/misc-5 index 170a3ec05eae..5c458482d7c7 100755 --- a/dmake/tests/misc-5 +++ b/dmake/tests/misc-5 @@ -34,7 +34,7 @@ all : +@echo aa:\$(AA):bb EOT -output=$(${DMAKEPROG} -r -P2 -f $file1 all) +output=`eval ${DMAKEPROG} -r -P2 -f $file1 all` result=$? # The space between aaa and bbb comes from the += diff --git a/dmake/tests/misc-7 b/dmake/tests/misc-7 index 0d9c4fa8f87f..285f44d50e81 100755 --- a/dmake/tests/misc-7 +++ b/dmake/tests/misc-7 @@ -28,7 +28,7 @@ EOT mkdir -p "$file2" -output1=$(${DMAKEPROG} -r -f $file1) +output1=`eval ${DMAKEPROG} -r -f $file1` result1=$? if test "$output1" != ":$file2:"; then diff --git a/dmake/tests/misc-8 b/dmake/tests/misc-8 index a1c7c96ce2ff..28d27595ab84 100755 --- a/dmake/tests/misc-8 +++ b/dmake/tests/misc-8 @@ -31,7 +31,7 @@ ALL : mytarget.dpcc EOT -output=$(${DMAKEPROG} -r -f $file1) +output=`eval ${DMAKEPROG} -r -f $file1` result=$? test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles} diff --git a/dmake/tests/misc-9 b/dmake/tests/misc-9 index 546dbd6915a8..127df7176a65 100755 --- a/dmake/tests/misc-9 +++ b/dmake/tests/misc-9 @@ -40,7 +40,7 @@ mytarget.dpcc : EOT -output=$(${DMAKEPROG} -r -P2 -f $file1) +output=`eval ${DMAKEPROG} -r -P2 -f $file1` result=$? if test "$output" != "making: mytarget.obj"; then diff --git a/dmake/tests/recipes-1 b/dmake/tests/recipes-1 index 56033678f12f..c9108d86198f 100755 --- a/dmake/tests/recipes-1 +++ b/dmake/tests/recipes-1 @@ -24,7 +24,7 @@ line2 EOT -output=$(${DMAKEPROG} -r -f $file1) +output=`eval ${DMAKEPROG} -r -f $file1` result=$? if test "$output" != "line1line2"; then echo "Wrong result" @@ -34,4 +34,5 @@ fi test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles} test $result -ne 0 && echo "Failure!" -exit $result
\ No newline at end of file +exit $result + |