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.

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 +=

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

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}

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

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
+