commit c0290039ad071a4dfd512454492073b85c24bc8c
Author: Kornel Benko <[email protected]>
Date: Mon Nov 23 13:07:53 2015 +0100
Cmake url tests: Added summary files.
The files will be locatet in the build-directory "Testing/Temporary" as
LastFailedAccessibleURLS.log
LastFailedInaccessibleURLS.log
LastFailedKnownInvalidURLS.log
diff --git a/development/checkurls/CMakeLists.txt
b/development/checkurls/CMakeLists.txt
index 5c3655d..0adb9a3 100644
--- a/development/checkurls/CMakeLists.txt
+++ b/development/checkurls/CMakeLists.txt
@@ -27,7 +27,8 @@ add_test(NAME "check_accessible_urls"
COMMAND ${PERL_EXECUTABLE} "${SEARCH_URL_SCRIPT}"
"filesToScan=${LYXFILES_FILE}"
"ignoredURLS=${CMAKE_CURRENT_SOURCE_DIR}/inaccessibleURLS"
- "ignoredURLS=${CMAKE_CURRENT_SOURCE_DIR}/knownInvalidURLS")
+ "ignoredURLS=${CMAKE_CURRENT_SOURCE_DIR}/knownInvalidURLS"
+
"summaryFile=${TOP_BINARY_DIR}/Testing/Temporary/LastFailedAccessibleURLS.log")
# Test inaccessible, but revert the error marker (failed <=> passed)
# if this fails, then some url is accessible and does not belong
@@ -37,7 +38,8 @@ add_test(NAME "check_inaccessible_urls"
COMMAND ${PERL_EXECUTABLE} "${SEARCH_URL_SCRIPT}"
"filesToScan=${LYXFILES_FILE}"
"selectedURLS=${CMAKE_CURRENT_SOURCE_DIR}/inaccessibleURLS"
- "revertedURLS=${CMAKE_CURRENT_SOURCE_DIR}/inaccessibleURLS")
+ "revertedURLS=${CMAKE_CURRENT_SOURCE_DIR}/inaccessibleURLS"
+
"summaryFile=${TOP_BINARY_DIR}/Testing/Temporary/LastFailedInaccessibleURLS.log")
#
# Test our own bad urls
@@ -47,7 +49,8 @@ add_test(NAME "check_invalid_urls"
WORKING_DIRECTORY "${TOP_SEARCH_PATH}"
COMMAND ${PERL_EXECUTABLE} "${SEARCH_URL_SCRIPT}"
"extraURLS=${CMAKE_CURRENT_SOURCE_DIR}/knownInvalidURLS"
- "revertedURLS=${CMAKE_CURRENT_SOURCE_DIR}/knownInvalidURLS")
+ "revertedURLS=${CMAKE_CURRENT_SOURCE_DIR}/knownInvalidURLS"
+
"summaryFile=${TOP_BINARY_DIR}/Testing/Temporary/LastFailedKnownInvalidURLS.log")
add_test(NAME "check_translators"
WORKING_DIRECTORY "${TOP_BINARY_DIR}"
diff --git a/development/checkurls/search_url.pl
b/development/checkurls/search_url.pl
index 1613f72..836a6ac 100755
--- a/development/checkurls/search_url.pl
+++ b/development/checkurls/search_url.pl
@@ -58,6 +58,7 @@ my %ignoredURLS = ();
my %revertedURLS = ();
my %extraURLS = ();
my %selectedURLS = ();
+my $summaryFile = undef;
my $checkSelectedOnly = 0;
for my $arg (@ARGV) {
@@ -86,6 +87,11 @@ for my $arg (@ARGV) {
$checkSelectedOnly = 1;
readUrls($val, %selectedURLS);
}
+ elsif ($type eq "summaryFile") {
+ if (open(SFO, '>', "$val")) {
+ $summaryFile = $val;
+ }
+ }
else {
die("Invalid argument \"$arg\"");
}
@@ -107,21 +113,25 @@ for my $u (@urls) {
next if ($checkSelectedOnly && ! defined($selectedURLS{$u}));
$URLScount++;
print "Checking '$u': ";
- my ($res, $prnt);
+ my ($res, $prnt, $outSum);
try {
$res = check_url($u);
if ($res) {
- $prnt = "Failed";
+ print "Failed\n";
+ $prnt = "";
+ $outSum = 1;
}
else {
- $prnt = "OK";
+ $prnt = "OK\n";
+ $outSum = 0;
}
}
catch {
- $prnt = "Failed, caught error: $_";
+ $prnt = "Failed, caught error: $_\n";
+ $outSum = 1;
$res = 700;
};
- print "$prnt\n";
+ printx("$prnt", $outSum);
my $printSourceFiles = 0;
my $err_txt = "Error url:";
@@ -133,13 +143,13 @@ for my $u (@urls) {
}
$res = ! $res if (defined($revertedURLS{$u}));
if ($res || $checkSelectedOnly) {
- print "$err_txt \"$u\"\n";
+ printx("$err_txt \"$u\"\n", $outSum);
}
if ($printSourceFiles) {
if (defined($URLS{$u})) {
for my $f(sort keys %{$URLS{$u}}) {
my $lines = ":" . join(',', @{$URLS{$u}->{$f}});
- print " $f$lines\n";
+ printx(" $f$lines\n", $outSum);
}
}
if ($res ) {
@@ -155,9 +165,20 @@ if (%URLS) {
}
print "\n$errorcount URL-tests failed out of $URLScount\n\n";
+if (defined($summaryFile)) {
+ close(DFO);
+}
exit($errorcount);
###############################################################################
+sub printx($$)
+{
+ my ($txt, $outSum) = @_;
+ print "$txt";
+ if ($outSum && defined($summaryFile)) {
+ print SFO "$txt";
+ }
+}
sub printNotUsedURLS($\%)
{