Commit 7025e13d authored by Morten Welinder's avatar Morten Welinder

Tests: always run xmllint with --nonet

We don't want to download the same schemas over and over again.
If anything is missing, the "extras" part of t6152 should be copied
into the test that needs it.
parent 34552994
......@@ -52,9 +52,11 @@ if (!-r $schema_manifest) {
print STDERR "NOTE: Suggest rerunning with argument \"download\" to obtain missing schemas\n"
if $suggest_download;
my $checker = "$xmllint --noout" . ($schema ? " --relaxng $schema" : "");
my $checker_ext = "$xmllint --noout" . ($schema_ext ? " --relaxng $schema_ext" : "");
my $manifest_checker = "$xmllint --noout" . ($schema_manifest ? " --relaxng $schema_manifest" : "");
my $common_checker = "$xmllint --noout --nonet";
my $checker = $common_checker . ($schema ? " --relaxng $schema" : "");
my $checker_ext = $common_checker . ($schema_ext ? " --relaxng $schema_ext" : "");
my $manifest_checker = $common_checker . ($schema_manifest ? " --relaxng $schema_manifest" : "");
my %checkers = ( 0 => $checker,
1 => $checker_ext,
2 => $manifest_checker);
......
......@@ -36,7 +36,7 @@ foreach my $src (@sources) {
die "Fail\n";
}
my $out = `$xmllint --noout --schema $schema $tmp 2>&1`;
my $out = `$xmllint --nonet --noout --schema $schema $tmp 2>&1`;
if ($out !~ /validates$/) {
print STDERR "While checking $tmp:\n";
&GnumericTest::dump_indented ($out);
......
......@@ -9,7 +9,6 @@ $GnumericTest::default_corpus = 'random:5';
&message ("Check the ods importer/exporter with valgrind.");
my $xmllint = &GnumericTest::find_program ("xmllint");
my $unzip = &GnumericTest::find_program ("unzip");
my $format = "Gnumeric_OpenCalc:odf";
......
......@@ -9,7 +9,6 @@ $GnumericTest::default_corpus = 'random:5';
&message ("Check the xlsx importer/exporter with valgrind.");
my $xmllint = &GnumericTest::find_program ("xmllint");
my $unzip = &GnumericTest::find_program ("unzip");
my $format = "Gnumeric_Excel:xlsx";
......
......@@ -27,7 +27,7 @@ for my $p (@pairs) {
print STDERR "$first vs $second...\n";
my $cmd = "$ssdiff --xml $first $second | xmllint -noout - 2>&1";
my $cmd = "$ssdiff --xml $first $second | $xmllint --nonet --noout - 2>&1";
print STDERR "$cmd\n" if $GnumericTest::verbose;
my $output = `$cmd 2>&1`;
my $err = $?; # from xmllint
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment