diff options
Diffstat (limited to 'dmake')
| -rw-r--r-- | dmake/make.c | 5 | ||||
| -rwxr-xr-x | dmake/tests/misc-13 | 2 | ||||
| -rwxr-xr-x | dmake/tests/misc-15 | 2 | ||||
| -rwxr-xr-x | dmake/tests/targets-28 | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/dmake/make.c b/dmake/make.c index 0f7ab644627f..67af0653d35f 100644 --- a/dmake/make.c +++ b/dmake/make.c @@ -251,8 +251,9 @@ Make_targets()/* for( lp = Targets->ce_prq; lp != NIL(LINK); lp = lp->cl_next ) { CELLPTR tgt = lp->cl_prq; - if( !(tgt->ce_attr & A_UPDATED) ) - printf( "`%s' is up to date\n", tgt->CE_NAME ); + if( !(tgt->ce_attr & A_UPDATED) + && (Verbose & V_MAKE) ) + printf( "`%s' is up to date\n", tgt->CE_NAME ); } DB_RETURN( 0 ); diff --git a/dmake/tests/misc-13 b/dmake/tests/misc-13 index a2381a8c00cc..7493e744b6b6 100755 --- a/dmake/tests/misc-13 +++ b/dmake/tests/misc-13 @@ -38,7 +38,7 @@ TeSt.target : EOT -output=`eval ${DMAKEPROG} -r -f $file1` +output=`eval ${DMAKEPROG} -vm -r -f $file1` result=$? if echo "$output" | grep -v ".target' is up to date" > /dev/null 2>&1 ; then diff --git a/dmake/tests/misc-15 b/dmake/tests/misc-15 index 1c52324a88d5..a213c2d885af 100755 --- a/dmake/tests/misc-15 +++ b/dmake/tests/misc-15 @@ -37,7 +37,7 @@ MYTARGET:=\$(PWD)/target.abc EOT -output=`eval ${DMAKEPROG} -r -f $file1` +output=`eval ${DMAKEPROG} -vm -r -f $file1` result=$? if echo "$output" | grep "target.abc' is up to date" > /dev/null 2>&1 ; then diff --git a/dmake/tests/targets-28 b/dmake/tests/targets-28 index da202b0d2025..0943eb6677ff 100755 --- a/dmake/tests/targets-28 +++ b/dmake/tests/targets-28 @@ -112,10 +112,10 @@ sleep 1 # This tests that aa.x is not build as the dependency chain is intact with # the virtual target aa.y having the same time stamp as aa.z. -output3=`eval ${DMAKEPROG} -rf $file1 2>&1` +output3=`eval ${DMAKEPROG} -vm -rf $file1 2>&1` result3=$? -if test $result3 = 0 -a "$output3" = "\`aa.x' is up to date" ; then +if test $result3 = 0 && echo "$output3" | grep "aa.x' is up to date" > /dev/null 2>&1 ; then echo "Subtest 3: OK" result3=0 else |