diff --git a/qa/023 b/qa/023 index 6708e99bb3..78aeaded8f 100755 --- a/qa/023 +++ b/qa/023 @@ -168,7 +168,7 @@ _disable_agent_restart() trap "_cleanup; exit \$status" 0 1 2 3 15 -rm -f $here/$seq_full +rm -f $seq_full echo "SAVE_LOGGER=$SAVE_LOGGER" >>$seq_full # real QA test starts here diff --git a/qa/051 b/qa/051 index 376342d2e8..6c9db7fda5 100755 --- a/qa/051 +++ b/qa/051 @@ -60,7 +60,7 @@ me=`hostname` _needclean=true -rm -f $here/$seq_full +rm -f $seq_full _filter_hostnames() { diff --git a/qa/053 b/qa/053 index 60bcae8b61..b96fb9b301 100755 --- a/qa/053 +++ b/qa/053 @@ -25,7 +25,7 @@ _filter() trap "rm -f $tmp $tmp.*; exit" 0 1 2 3 15 -rm -f $here/$seq_full +rm -f $seq_full # real QA test starts here cat >$tmp.config <$tmp.config </dev/null 2>&1 [ $? -eq 0 ] || _notrun "python six module not installed" status=1 # failure is the default! -$sudo rm -rf $tmp.* $seq.full +$sudo rm -rf $tmp.* $seq_full mkdir $tmp chmod ugo+rwx $tmp cd $tmp @@ -68,7 +68,7 @@ _drain_output_sorted() _filter() { - tee -a $here/$seq.full | \ + tee -a $seq_full | \ sed \ -e "s;$PCP_PMDAS_DIR;\$PCP_PMDAS_DIR;" \ -e '/pmResult/s/ .* numpmid/ ... numpmid/' \ @@ -81,7 +81,7 @@ _filter() _filter2() { - tee -a $here/$seq.full | \ + tee -a $seq_full | \ sed \ -e '2,$s/^\([0-9][0-9]*\) [0-9][0-9]* /\1 TIMESTAMP /' } @@ -484,7 +484,7 @@ _drain_output # Wait for dbpmda to quit. wait -cat json.log >>$here/$seq.full +cat json.log >> $seq_full status=0 exit diff --git a/qa/174 b/qa/174 index 745fe2ed5b..8cb0b650a4 100755 --- a/qa/174 +++ b/qa/174 @@ -61,7 +61,7 @@ gotGetPDU==1 && $1 ~ /[0-9][0-9][0-9]:/ { next } status=1 trap "$sudo rm -f $tmp.*; exit \$status" 0 1 2 3 15 -$sudo rm -f $here/$seq_full +$sudo rm -f $seq_full # real QA test starts here diff --git a/qa/264 b/qa/264 index 15f257e50c..064fd72f56 100755 --- a/qa/264 +++ b/qa/264 @@ -17,15 +17,10 @@ status=1 # failure is the default! trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here - src/pmnsinarchives >$tmp.out 2>$tmp.err cat $tmp.err cat $tmp.out -# optional stuff if your test has verbose output to help resolve problems -#echo -#echo "If failure, check $seq.full (this) and $seq.full.ok (reference)" - # success, all done status=0 exit diff --git a/qa/274 b/qa/274 index 6af6ad2299..9fb087780f 100755 --- a/qa/274 +++ b/qa/274 @@ -16,7 +16,7 @@ echo "QA output created by $seq" signal=$PCP_BINADM_DIR/pmsignal status=1 trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 -$sudo rm -f $here/$seq_full +$sudo rm -f $seq_full _filter() { diff --git a/qa/354 b/qa/354 index b8a7882160..3e1188a1a6 100755 --- a/qa/354 +++ b/qa/354 @@ -98,7 +98,7 @@ NR == 1 { if ($2 != "PID") { { print "ps:",$2,$cmd,$(cmd+1),$(cmd+2),$(cmd+3),$(cmd+4) }' } -rm -f $here/$seq_full +rm -f $seq_full # NOT the default pmconfirm(1), please # diff --git a/qa/430 b/qa/430 index 6dadab7470..7f305c19ad 100755 --- a/qa/430 +++ b/qa/430 @@ -228,7 +228,7 @@ EOF } # real QA test starts here -rm -f $here/$seq_full +rm -f $seq_full host1=$LOCALHOST host2=$LOCALHOST"super" diff --git a/qa/864 b/qa/864 index 733e6e7ad9..6e47ec8a32 100755 --- a/qa/864 +++ b/qa/864 @@ -45,7 +45,7 @@ _filter() # real QA test starts here -rm -f $here/$seq_full +rm -f $seq_full pcp collectl -R 1.25 -i 1 | tee -a $seq_full | _filter # success, all done