Update the harness to recognize icu flags on spectest.data,

and to check for icu availability when running 'make spectest'. Add a icu-dependent test to spectest.data (which should be skipped on platforms that don't have icu present).
rakudo · Apr 3, 2009 · 07af82b · 07af82b
1 parent fff26a1
commit 07af82b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -12,6 +12,7 @@ EXE           = @exe@
 MAKE          = @make_c@
 PERL          = @perl@
 RM_F          = @rm_f@
+HAS_ICU       = @has_icu@
 
 # Various paths
 PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext
@@ -159,7 +160,7 @@ CLEANUPS = \
 
 # NOTE: eventually, we should remove --keep-exit-code and --fudge
 #       as the goal is that all tests must pass without fudge
-HARNESS_WITH_FUDGE = $(PERL) t/harness --fudge --keep-exit-code
+HARNESS_WITH_FUDGE = $(PERL) t/harness --fudge --keep-exit-code --icu=$(HAS_ICU)
 HARNESS_WITH_FUDGE_JOBS = $(HARNESS_WITH_FUDGE) --jobs
 
 

diff --git a/t/harness b/t/harness
@@ -21,6 +21,7 @@ GetOptions(
     'fudge'             => \my $do_fudge,
     'verbosity=i'       => \$Test::Harness::verbose,
     'jobs:3'            => \my $jobs,
+    'icu:1'             => \my $do_icu,
 );
 my @pass_through_options = grep m/^--?[^-]/, @ARGV;
 my @files = grep m/^[^-]/, @ARGV;
@@ -34,7 +35,8 @@ if ($list_file) {
         next if m/^\s*#/;
         next unless m/\S/;
         chomp;
-        my ($fn, $fudgespec) = split m/\s+#\s*/;
+        my ($fn, $fudgespec) = split /\s+#\s*/;
+        next if ($fudgespec && ($fudgespec =~ m/icu/) && !$do_icu);
         $fn = "t/spec/$fn" unless $fn =~ m/^t\Q$slash\Espec\Q$slash\E/;
         $fn =~ s{/}{$slash}g;
         if ( -r $fn ) {

diff --git a/t/spectest.data b/t/spectest.data
@@ -55,6 +55,7 @@ S02-builtin_data_types/type.t
 S02-builtin_data_types/whatever.t
 S02-literals/array-interpolation.t
 S02-literals/autoref.t
+S02-literals/char-by-name.t                                # icu
 S02-literals/char-by-number.t
 S02-literals/hash-interpolation.t
 S02-literals/hex_chars.t