From: Debian QA Group Date: Tue, 10 Jan 2017 11:56:02 +0000 (+0000) Subject: check_log_fix X-Git-Tag: archive/raspbian/6.1.6+dfsg2-4+rpi1^2~7 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=668cee652e5aad7ed23f25380f54409b6e3d81d9;p=virtuoso-opensource.git check_log_fix commit f78a4b20bd38ce064e62bc154dcca8a2109e015a Author: Maximiliano Curia Date: Wed Jun 5 11:26:01 2013 +0200 Check log fix Gbp-Pq: Name check_log_fix.patch --- diff --git a/appsrc/ODS-Addressbook/make_vad.sh b/appsrc/ODS-Addressbook/make_vad.sh index 759dcc3e..74f56388 100755 --- a/appsrc/ODS-Addressbook/make_vad.sh +++ b/appsrc/ODS-Addressbook/make_vad.sh @@ -447,7 +447,7 @@ chmod 644 ods_addressbook_dav.vad chmod 644 ods_addressbook_filesystem.vad CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Blog/make_vad.sh b/appsrc/ODS-Blog/make_vad.sh index 81c77e4b..9586a198 100755 --- a/appsrc/ODS-Blog/make_vad.sh +++ b/appsrc/ODS-Blog/make_vad.sh @@ -473,7 +473,7 @@ chmod 644 ods_blog_dav.vad #chmod 644 virtuoso.trx CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Bookmark/make_vad.sh b/appsrc/ODS-Bookmark/make_vad.sh index fa9b2431..1ca73f0e 100755 --- a/appsrc/ODS-Bookmark/make_vad.sh +++ b/appsrc/ODS-Bookmark/make_vad.sh @@ -445,7 +445,7 @@ chmod 644 ods_bookmark_dav.vad chmod 644 ods_bookmark_filesystem.vad CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Briefcase/make_vad.sh b/appsrc/ODS-Briefcase/make_vad.sh index c59e5ec8..4d318213 100755 --- a/appsrc/ODS-Briefcase/make_vad.sh +++ b/appsrc/ODS-Briefcase/make_vad.sh @@ -468,7 +468,7 @@ chmod 644 ods_briefcase_filesystem.vad directory_clean CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Calendar/make_vad.sh b/appsrc/ODS-Calendar/make_vad.sh index 93d6fd52..ce0d29a9 100755 --- a/appsrc/ODS-Calendar/make_vad.sh +++ b/appsrc/ODS-Calendar/make_vad.sh @@ -447,7 +447,7 @@ chmod 644 ods_calendar_dav.vad chmod 644 ods_calendar_filesystem.vad CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Community/make_vad.sh b/appsrc/ODS-Community/make_vad.sh index 56e916c4..fbc32f96 100755 --- a/appsrc/ODS-Community/make_vad.sh +++ b/appsrc/ODS-Community/make_vad.sh @@ -418,7 +418,7 @@ STOP_SERVER chmod 644 ods_community_dav.vad CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Discussion/make_vad.sh b/appsrc/ODS-Discussion/make_vad.sh index 3c665847..d0717d82 100755 --- a/appsrc/ODS-Discussion/make_vad.sh +++ b/appsrc/ODS-Discussion/make_vad.sh @@ -416,7 +416,7 @@ virtuoso_shutdown chmod 644 ods_discussion_dav.vad CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-FeedManager/make_vad.sh b/appsrc/ODS-FeedManager/make_vad.sh index df4da726..31dd02f5 100755 --- a/appsrc/ODS-FeedManager/make_vad.sh +++ b/appsrc/ODS-FeedManager/make_vad.sh @@ -462,7 +462,7 @@ chmod 644 $VAD_DAV chmod 644 $VAD_FS CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Framework/make_vad.sh b/appsrc/ODS-Framework/make_vad.sh index 2a4ae244..44a986fd 100755 --- a/appsrc/ODS-Framework/make_vad.sh +++ b/appsrc/ODS-Framework/make_vad.sh @@ -575,7 +575,7 @@ chmod 644 ods_framework_dav.vad #chmod 644 virtuoso.trx CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Framework/oauth/make_vad.sh b/appsrc/ODS-Framework/oauth/make_vad.sh index ea8e982a..57fa0edf 100755 --- a/appsrc/ODS-Framework/oauth/make_vad.sh +++ b/appsrc/ODS-Framework/oauth/make_vad.sh @@ -433,7 +433,7 @@ chmod 644 $VAD_NAME_RELEASE directory_clean CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Gallery/make_vad.sh b/appsrc/ODS-Gallery/make_vad.sh index cb59b6db..3cbc16de 100755 --- a/appsrc/ODS-Gallery/make_vad.sh +++ b/appsrc/ODS-Gallery/make_vad.sh @@ -436,7 +436,7 @@ STOP_SERVER chmod 644 ods_gallery_dav.vad CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Polls/make_vad.sh b/appsrc/ODS-Polls/make_vad.sh index 5836fab9..3cd46d3a 100755 --- a/appsrc/ODS-Polls/make_vad.sh +++ b/appsrc/ODS-Polls/make_vad.sh @@ -419,7 +419,7 @@ chmod 644 ods_polls_dav.vad chmod 644 ods_polls_filesystem.vad CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-WebMail/make_vad.sh b/appsrc/ODS-WebMail/make_vad.sh index b3d987a7..647c6c34 100755 --- a/appsrc/ODS-WebMail/make_vad.sh +++ b/appsrc/ODS-WebMail/make_vad.sh @@ -449,7 +449,7 @@ chmod 644 ods_webmail_dav.vad chmod 644 ods_webmail_filesystem.vad CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/appsrc/ODS-Wiki/make_vad.sh b/appsrc/ODS-Wiki/make_vad.sh index 18479eaf..73d8b11b 100755 --- a/appsrc/ODS-Wiki/make_vad.sh +++ b/appsrc/ODS-Wiki/make_vad.sh @@ -515,7 +515,7 @@ echo `pwd` chmod 644 ods_wiki_dav.vad CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/b3s/make_vad.sh b/binsrc/b3s/make_vad.sh index 3ee5879e..39671fa4 100755 --- a/binsrc/b3s/make_vad.sh +++ b/binsrc/b3s/make_vad.sh @@ -497,7 +497,7 @@ chmod 644 $VAD_NAME_RELEASE directory_clean CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/bpel/make_vad.sh b/binsrc/bpel/make_vad.sh index 9a996e11..b04518dc 100755 --- a/binsrc/bpel/make_vad.sh +++ b/binsrc/bpel/make_vad.sh @@ -687,7 +687,7 @@ chmod 644 $VAD_NAME_RELEASE directory_clean CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/dbpedia/make_vad.sh b/binsrc/dbpedia/make_vad.sh index a94f1753..879780f9 100755 --- a/binsrc/dbpedia/make_vad.sh +++ b/binsrc/dbpedia/make_vad.sh @@ -443,7 +443,7 @@ chmod 644 $VAD_NAME_DEVEL chmod 644 $VAD_NAME_RELEASE CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/isparql/make_vad.sh b/binsrc/isparql/make_vad.sh index e0e13d79..5a3cf226 100755 --- a/binsrc/isparql/make_vad.sh +++ b/binsrc/isparql/make_vad.sh @@ -433,7 +433,7 @@ chmod 644 virtuoso.trx directory_clean CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/rdb2rdf/make_vad.sh b/binsrc/rdb2rdf/make_vad.sh index bc06df8b..98aef5bc 100755 --- a/binsrc/rdb2rdf/make_vad.sh +++ b/binsrc/rdb2rdf/make_vad.sh @@ -354,7 +354,7 @@ else fi CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/rdf_mappers/make_vad.sh b/binsrc/rdf_mappers/make_vad.sh index 3555b0e0..78847689 100755 --- a/binsrc/rdf_mappers/make_vad.sh +++ b/binsrc/rdf_mappers/make_vad.sh @@ -525,7 +525,7 @@ chmod 644 $VAD_NAME_DEVEL chmod 644 $VAD_NAME_RELEASE CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/samples/demo/make_vad.sh b/binsrc/samples/demo/make_vad.sh index 5a4abc50..d5845b21 100755 --- a/binsrc/samples/demo/make_vad.sh +++ b/binsrc/samples/demo/make_vad.sh @@ -589,7 +589,7 @@ chmod 644 virtuoso.trx directory_clean CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/samples/demo/mkdemo.sh b/binsrc/samples/demo/mkdemo.sh index 353fa6c1..be7cbaf7 100755 --- a/binsrc/samples/demo/mkdemo.sh +++ b/binsrc/samples/demo/mkdemo.sh @@ -392,7 +392,7 @@ DO_COMMAND shutdown BREAK -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then exit 1 @@ -433,7 +433,7 @@ fi # Show final results of run # CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then exit 1 diff --git a/binsrc/samples/demo/mkdoc.sh b/binsrc/samples/demo/mkdoc.sh index 9a840755..e54eb765 100755 --- a/binsrc/samples/demo/mkdoc.sh +++ b/binsrc/samples/demo/mkdoc.sh @@ -628,7 +628,7 @@ BREAK BANNER "COMPLETED DOCUMENTATION demo (mkdoc.sh)" CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f "$VAD_NAME_RELEASE" diff --git a/binsrc/samples/sparql_demo/make_vad.sh b/binsrc/samples/sparql_demo/make_vad.sh index ece25b28..3529c907 100755 --- a/binsrc/samples/sparql_demo/make_vad.sh +++ b/binsrc/samples/sparql_demo/make_vad.sh @@ -413,7 +413,7 @@ chmod 644 virtuoso.trx directory_clean CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/sync/make_vad.sh b/binsrc/sync/make_vad.sh index 0e621772..7e93ec7a 100755 --- a/binsrc/sync/make_vad.sh +++ b/binsrc/sync/make_vad.sh @@ -377,7 +377,7 @@ chmod 644 syncml_dav.vad directory_clean CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/tutorial/make_vad.sh b/binsrc/tutorial/make_vad.sh index 4042e069..731597e8 100755 --- a/binsrc/tutorial/make_vad.sh +++ b/binsrc/tutorial/make_vad.sh @@ -633,7 +633,7 @@ else fi CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/vsp/admin/debug/make_vad.sh b/binsrc/vsp/admin/debug/make_vad.sh index 9d672d77..6a3da3f7 100755 --- a/binsrc/vsp/admin/debug/make_vad.sh +++ b/binsrc/vsp/admin/debug/make_vad.sh @@ -335,7 +335,7 @@ directory_clean CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then $myrm -f *.vad diff --git a/binsrc/yacutia/mkvad.sh b/binsrc/yacutia/mkvad.sh index 3036991e..7c17aee7 100755 --- a/binsrc/yacutia/mkvad.sh +++ b/binsrc/yacutia/mkvad.sh @@ -468,7 +468,7 @@ chmod 644 conductor_filesystem.vad # Show final results of run # CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" +RUN egrep -q '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" if test $STATUS -eq 0 then rm -f *.vad