diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:50:35 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:50:35 +0000 |
commit | fa13553581db5a52386cfb050da91b7b7bb55590 (patch) | |
tree | ffb17c4b4c6736b499cd03355258e73d213684a6 /dmake | |
parent | 7c5a41509ee1a5f835920ec1cd6e7ccb060165c6 (diff) |
INTEGRATION: CWS dmake411 (1.1.2); FILE ADDED
2007/10/06 14:33:06 vq 1.1.2.2: #i80598# Always issue a warning if the actual execution of a recipe line
(this does not include sucessfully executed, but failing programs) fails.
2007/08/11 21:23:42 vq 1.1.2.1: #i80598# Add testcase.
Diffstat (limited to 'dmake')
-rwxr-xr-x | dmake/tests/recipes-9 | 117 |
1 files changed, 117 insertions, 0 deletions
diff --git a/dmake/tests/recipes-9 b/dmake/tests/recipes-9 new file mode 100755 index 000000000000..409b6cbabe33 --- /dev/null +++ b/dmake/tests/recipes-9 @@ -0,0 +1,117 @@ +#!/bin/sh + +# 11.08.2007 Volker Quetschke +# Test that recipes with error can be ignored. +# (issue 80598) + +: ${DMAKEPROG:=dmake} +file1="mfile1.mk" +tmpfiles="$file1" + +trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15 + +# Remove files from prior failed run +rm -rf $tmpfiles + +# Remember to quote variables in generated makefiles( $ -> \$ ). +# Test 1 - Ignore, but display failed execution. +cat > $file1 <<EOT +SHELL*:=/bin/sh +SHELLFLAGS*:=-ce + +all .IGNORE : + tttouch all + +EOT + +output1=`eval ${DMAKEPROG} -r -f $file1 2>&1` +result1=$? + +if test "$result1" = "0" && echo $output1 | grep '(Ignored)' > /dev/null 2>&1 ; then + echo "Subtest 1: OK" + result1=0 +else + echo "Subtest 1: Wrong result: $output1" + echo + result1=1 +fi + + +# Test 2 - Ignore, but display failed execution. +cat > $file1 <<EOT +SHELL*:=/bin/sh +SHELLFLAGS*:=-ce + +all : + -ttttouch all + +EOT + +output2=`eval ${DMAKEPROG} -r -f $file1 2>&1` +result2=$? + +if test "$result2" = "0" && echo $output2 | grep '(Ignored)' > /dev/null 2>&1 ; then + echo "Subtest 2: OK" + result2=0 +else + echo "Subtest 2: Wrong result: $output2" + echo + result2=1 +fi + + +# Test 3 +cat > $file1 <<EOT +SHELL*:=/bin/sh +SHELLFLAGS*:=-ce +GROUPSHELL*:=/bin/sh + +all : + ttttouch all + +EOT + +output3=`eval ${DMAKEPROG} -r -f $file1 2>&1` +result3=$? +if test $result3 != 0 && echo $output3 | grep 'Error code -1, while making ' > /dev/null 2>&1 ; then + echo "Subtest 3: OK" + result3=0 +else + echo "Subtest 3: Wrong result: $output3" + echo + result3=1 +fi + + +# Test 4 - Ignore a succesfully executed, but failing recipe. +cat > $file1 <<EOT +SHELL*:=/bin/sh +SHELLFLAGS*:=-ce + +all : + -false all + +EOT + +output4=`eval ${DMAKEPROG} -r -f $file1 2>&1` +result4=$? + +if test "$result4" = "0" -a "$output4" = "false all" ; then + echo "Subtest 4: OK" + result4=0 +else + echo "Subtest 4: Wrong result: $output4" + echo + result4=1 +fi + + + +if test $result1 -eq 0 -a $result2 -eq 0 \ + -a $result3 -eq 0 -a $result4 -eq 0 ; then + echo "Success - Cleaning up" && rm -f ${tmpfiles} + exit +else + echo "Failure!" + exit 1 +fi |