You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2006/10/18 18:36:44 UTC
svn commit: r465291 - in /xerces/c/trunk/swig/perl: ./ samples/ scripts/ t/
Author: amassari
Date: Wed Oct 18 09:36:34 2006
New Revision: 465291
URL: http://svn.apache.org/viewvc?view=rev&rev=465291
Log:
Updated tests to run on Windows
Modified:
xerces/c/trunk/swig/perl/memtest.pl
xerces/c/trunk/swig/perl/samples/EnumVal.pl
xerces/c/trunk/swig/perl/samples/SEnumVal.pl
xerces/c/trunk/swig/perl/scripts/memtest-light.pl
xerces/c/trunk/swig/perl/scripts/memtest.pl
xerces/c/trunk/swig/perl/t/DOMConfig.t
xerces/c/trunk/swig/perl/t/DOMCount.t
xerces/c/trunk/swig/perl/t/DOMCreate.t
xerces/c/trunk/swig/perl/t/DOMImplementation.t
xerces/c/trunk/swig/perl/t/DOMLSOutput.t
xerces/c/trunk/swig/perl/t/DOMLSParser.t
xerces/c/trunk/swig/perl/t/DOMLSSerializer.t
xerces/c/trunk/swig/perl/t/DOMNodeIterator.t
xerces/c/trunk/swig/perl/t/DOMParser.t
xerces/c/trunk/swig/perl/t/DOMPrint.t
xerces/c/trunk/swig/perl/t/EnumVal.t
xerces/c/trunk/swig/perl/t/SAX2Count.t
xerces/c/trunk/swig/perl/t/SAXCount.t
xerces/c/trunk/swig/perl/t/SEnumVal.t
xerces/c/trunk/swig/perl/t/XMLValidator.t
Modified: xerces/c/trunk/swig/perl/memtest.pl
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/memtest.pl?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/memtest.pl (original)
+++ xerces/c/trunk/swig/perl/memtest.pl Wed Oct 18 09:36:34 2006
@@ -1,4 +1,4 @@
-use blib;
+#use blib;
use XML::Xerces;
use strict;
use Getopt::Long;
Modified: xerces/c/trunk/swig/perl/samples/EnumVal.pl
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/samples/EnumVal.pl?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/samples/EnumVal.pl (original)
+++ xerces/c/trunk/swig/perl/samples/EnumVal.pl Wed Oct 18 09:36:34 2006
@@ -25,7 +25,7 @@
######################################################################
use strict;
-use blib;
+# use blib;
use XML::Xerces qw(error);
use XML::Xerces::SAX;
use Getopt::Long;
Modified: xerces/c/trunk/swig/perl/samples/SEnumVal.pl
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/samples/SEnumVal.pl?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/samples/SEnumVal.pl (original)
+++ xerces/c/trunk/swig/perl/samples/SEnumVal.pl Wed Oct 18 09:36:34 2006
@@ -25,7 +25,7 @@
######################################################################
use strict;
-use blib;
+# use blib;
use XML::Xerces qw(error);
use XML::Xerces::SAX;
use Getopt::Long;
Modified: xerces/c/trunk/swig/perl/scripts/memtest-light.pl
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/scripts/memtest-light.pl?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/scripts/memtest-light.pl (original)
+++ xerces/c/trunk/swig/perl/scripts/memtest-light.pl Wed Oct 18 09:36:34 2006
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-use blib;
+# use blib;
use XML::Xerces;
use strict;
use Getopt::Long;
Modified: xerces/c/trunk/swig/perl/scripts/memtest.pl
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/scripts/memtest.pl?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/scripts/memtest.pl (original)
+++ xerces/c/trunk/swig/perl/scripts/memtest.pl Wed Oct 18 09:36:34 2006
@@ -1,4 +1,4 @@
-use blib;
+# use blib;
use XML::Xerces;
use strict;
use Getopt::Long;
Modified: xerces/c/trunk/swig/perl/t/DOMConfig.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMConfig.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMConfig.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMConfig.t Wed Oct 18 09:36:34 2006
@@ -4,7 +4,7 @@
######################### Begin module loading
-use blib;
+# use blib;
use Test::More tests => 106;
BEGIN{use_ok('XML::Xerces::DOM')};
Modified: xerces/c/trunk/swig/perl/t/DOMCount.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMCount.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMCount.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMCount.t Wed Oct 18 09:36:34 2006
@@ -38,10 +38,15 @@
close(OUT);
my $perl = $Config{startperl};
-$perl =~ s/^\#!//;
-my $output = `$perl -Mblib $SAMPLE_DIR/DOMCount.pl $file 2>/dev/null`;
-# print STDERR "Out <$output>\n";
-$output =~ /(\d+) elems/;
+$perl =~ s/^\#!//;
+my $output;
+if ($^O eq 'MSWin32') {
+ $output = `$perl $SAMPLE_DIR/DOMCount.pl $file 2>NUL`;
+} else {
+ $output = `$perl $SAMPLE_DIR/DOMCount.pl $file 2>/dev/null`;
+}
+# print STDERR "Out <$output>\n";
+$output =~ /(\d+) elems/;
is($1, 10, 'element count');
END {unlink $file;}
Modified: xerces/c/trunk/swig/perl/t/DOMCreate.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMCreate.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMCreate.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMCreate.t Wed Oct 18 09:36:34 2006
@@ -39,8 +39,13 @@
my $perl = $Config{startperl};
-$perl =~ s/^\#!//;
-my $cmd = "$perl -Mblib $SAMPLE_DIR/DOMCreate.pl 2>/dev/null";
+$perl =~ s/^\#!//;
+my $cmd;
+if ($^O eq 'MSWin32') {
+ $cmd = "$perl $SAMPLE_DIR/DOMCreate.pl 2>NUL";
+} else {
+ $cmd = "$perl $SAMPLE_DIR/DOMCreate.pl 2>/dev/null";
+}
# print STDERR "Running: $cmd\n";
my $output = `$cmd`;
Modified: xerces/c/trunk/swig/perl/t/DOMImplementation.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMImplementation.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMImplementation.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMImplementation.t Wed Oct 18 09:36:34 2006
@@ -4,8 +4,8 @@
######################### Begin module loading
-use blib;
-use Test::More tests => 26;
+# use blib;
+use Test::More tests => 29;
BEGIN { use_ok("XML::Xerces::DOM") };
use lib 't';
Modified: xerces/c/trunk/swig/perl/t/DOMLSOutput.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMLSOutput.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMLSOutput.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMLSOutput.t Wed Oct 18 09:36:34 2006
@@ -40,7 +40,7 @@
isa_ok($output->getByteStream(), "XML::Xerces::MemBufFormatTarget",
'overloaded return val getByteStream');
-$target = XML::Xerces::LocalFileFormatTarget->new('/tmp/foo.xml');
+$target = XML::Xerces::LocalFileFormatTarget->new('./foo.xml');
$output->setByteStream($target);
isa_ok($output->getByteStream(), "XML::Xerces::XMLFormatTarget",
'byte stream');
Modified: xerces/c/trunk/swig/perl/t/DOMLSParser.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMLSParser.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMLSParser.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMLSParser.t Wed Oct 18 09:36:34 2006
@@ -43,7 +43,7 @@
is(scalar @persons, 6,'getting <person>s');
# test parseURI
-$doc = eval{$DOM->parseURI("file:$PERSONAL_FILE_NAME")};
+$doc = eval{$DOM->parseURI("file:///$PERSONAL_FILE_NAME")};
ok((not $@),'parseURI with file:');
isa_ok($doc,'XML::Xerces::DOMDocument');
@@ -69,10 +69,10 @@
@persons = $doc->getElementsByTagName('person');
is(scalar @persons, 6,'getting <person>s');
-
+my $to_cache;
my $grammar = $DOM->loadGrammar($PERSONAL_DTD_NAME,
$XML::Xerces::Grammar::DTDGrammarType,
- my $to_cache = 1);
+ $to_cache = 1);
isa_ok($grammar, "XML::Xerces::DTDGrammar",
'loadGrammar(path)');
@@ -88,7 +88,7 @@
$grammar = $DOM->loadGrammar($PERSONAL_SCHEMA_NAME,
$XML::Xerces::Grammar::SchemaGrammarType,
- my $to_cache = 1);
+ $to_cache = 1);
isa_ok($grammar, "XML::Xerces::SchemaGrammar",
'loadGrammar(path)');
Modified: xerces/c/trunk/swig/perl/t/DOMLSSerializer.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMLSSerializer.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMLSSerializer.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMLSSerializer.t Wed Oct 18 09:36:34 2006
@@ -5,7 +5,7 @@
######################### Begin module loading
# use blib;
-use Test::More tests => 35;
+use Test::More tests => 37;
BEGIN { use_ok("XML::Xerces::DOM") };
use strict;
Modified: xerces/c/trunk/swig/perl/t/DOMNodeIterator.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMNodeIterator.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMNodeIterator.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMNodeIterator.t Wed Oct 18 09:36:34 2006
@@ -4,7 +4,7 @@
######################### Begin module loading
-use blib;
+# use blib;
use Test::More tests => 7;
BEGIN { use_ok("XML::Xerces::DOM") };
use strict;
Modified: xerces/c/trunk/swig/perl/t/DOMParser.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMParser.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMParser.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMParser.t Wed Oct 18 09:36:34 2006
@@ -4,7 +4,7 @@
######################### Begin module loading
-use blib;
+# use blib;
use Test::More tests => 13;
BEGIN { use_ok("XML::Xerces::DOM") };
Modified: xerces/c/trunk/swig/perl/t/DOMPrint.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/DOMPrint.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/DOMPrint.t (original)
+++ xerces/c/trunk/swig/perl/t/DOMPrint.t Wed Oct 18 09:36:34 2006
@@ -42,8 +42,13 @@
close(OUT);
my $perl = $Config{startperl};
-$perl =~ s/^\#!//;
-my $output = `$perl -Mblib $SAMPLE_DIR/DOMPrint.pl $file 2>/dev/null`;
+$perl =~ s/^\#!//;
+my $output;
+if ($^O eq 'MSWin32') {
+ $output = `$perl $SAMPLE_DIR/DOMPrint.pl $file 2>NUL`;
+} else {
+ $output = `$perl $SAMPLE_DIR/DOMPrint.pl $file 2>/dev/null`;
+}
ok($document eq $output)
or diag("Expected: [$document]\nFound: [$output]\n");
Modified: xerces/c/trunk/swig/perl/t/EnumVal.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/EnumVal.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/EnumVal.t (original)
+++ xerces/c/trunk/swig/perl/t/EnumVal.t Wed Oct 18 09:36:34 2006
@@ -4,7 +4,7 @@
######################### Begin module loading
-use blib;
+# use blib;
use Test::More tests => 12;
BEGIN { use_ok(XML::Xerces::DOM) };
use Config;
@@ -23,8 +23,13 @@
XML::Xerces::XMLPlatformUtils::Initialize();
my $perl = $Config{startperl};
-$perl =~ s/^\#!//;
-my $output = `$perl -Mblib $SAMPLE_DIR/EnumVal.pl $PERSONAL_FILE_NAME 2>/dev/null`;
+$perl =~ s/^\#!//;
+my $output;
+if ($^O eq 'MSWin32') {
+ $output = `$perl $SAMPLE_DIR/EnumVal.pl $PERSONAL_FILE_NAME 2>NUL`;
+} else {
+ $output = `$perl $SAMPLE_DIR/EnumVal.pl $PERSONAL_FILE_NAME 2>/dev/null`;
+}
my @lines = split("\n", $output);
Modified: xerces/c/trunk/swig/perl/t/SAX2Count.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/SAX2Count.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/SAX2Count.t (original)
+++ xerces/c/trunk/swig/perl/t/SAX2Count.t Wed Oct 18 09:36:34 2006
@@ -16,8 +16,13 @@
######################### Begin Test
my $perl = $Config{startperl};
-$perl =~ s/^\#!//;
-my @output = split(/\n/,`$perl -Mblib $SAMPLE_DIR/SAX2Count.pl $PERSONAL_FILE_NAME 2>/dev/null`);
+$perl =~ s/^\#!//;
+my @output;
+if ($^O eq 'MSWin32') {
+ @output = split(/\n/,`$perl $SAMPLE_DIR/SAX2Count.pl $PERSONAL_FILE_NAME 2>NUL`);
+} else {
+ @output = split(/\n/,`$perl $SAMPLE_DIR/SAX2Count.pl $PERSONAL_FILE_NAME 2>/dev/null`);
+}
$output[1] =~ /\s(\d+)/;
is($1, 37,
'elems');
Modified: xerces/c/trunk/swig/perl/t/SAXCount.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/SAXCount.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/SAXCount.t (original)
+++ xerces/c/trunk/swig/perl/t/SAXCount.t Wed Oct 18 09:36:34 2006
@@ -14,10 +14,15 @@
use Config;
######################### Begin Test
-
+
my $perl = $Config{startperl};
-$perl =~ s/^\#!//;
-my @output = split(/\n/,`$perl -Mblib $SAMPLE_DIR/SAXCount.pl $PERSONAL_FILE_NAME 2>/dev/null`);
+$perl =~ s/^\#!//;
+my @output;
+if ($^O eq 'MSWin32') {
+ @output = split(/\n/,`$perl $SAMPLE_DIR/SAXCount.pl $PERSONAL_FILE_NAME 2>NUL`);
+} else {
+ @output = split(/\n/,`$perl $SAMPLE_DIR/SAXCount.pl $PERSONAL_FILE_NAME 2>/dev/null`);
+}
$output[1] =~ /\s(\d+)/;
is($1, 37,
'elems');
Modified: xerces/c/trunk/swig/perl/t/SEnumVal.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/SEnumVal.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/SEnumVal.t (original)
+++ xerces/c/trunk/swig/perl/t/SEnumVal.t Wed Oct 18 09:36:34 2006
@@ -4,7 +4,7 @@
######################### Begin module loading
-use blib;
+# use blib;
use Test::More tests => 12;
BEGIN { use_ok(XML::Xerces::DOM) };
use Config;
@@ -23,8 +23,13 @@
XML::Xerces::XMLPlatformUtils::Initialize();
my $perl = $Config{startperl};
-$perl =~ s/^\#!//;
-my $output = `$perl -Mblib $SAMPLE_DIR/SEnumVal.pl $PERSONAL_SCHEMA_FILE_NAME 2>/dev/null`;
+$perl =~ s/^\#!//;
+my $output;
+if ($^O eq 'MSWin32') {
+ $output = `$perl $SAMPLE_DIR/SEnumVal.pl $PERSONAL_SCHEMA_FILE_NAME 2>NUL`;
+} else {
+ $output = `$perl $SAMPLE_DIR/SEnumVal.pl $PERSONAL_SCHEMA_FILE_NAME 2>/dev/null`;
+}
my @lines = split("\n", $output);
Modified: xerces/c/trunk/swig/perl/t/XMLValidator.t
URL: http://svn.apache.org/viewvc/xerces/c/trunk/swig/perl/t/XMLValidator.t?view=diff&rev=465291&r1=465290&r2=465291
==============================================================================
--- xerces/c/trunk/swig/perl/t/XMLValidator.t (original)
+++ xerces/c/trunk/swig/perl/t/XMLValidator.t Wed Oct 18 09:36:34 2006
@@ -4,7 +4,7 @@
######################### Begin module loading
-use blib;
+# use blib;
use Test::More tests => 38;
BEGIN { use_ok(XML::Xerces::DOM) };
BEGIN { use_ok(XML::Xerces::SAX) };
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org