From 147ecbf864787f63623ac786597f821d85801c79 Mon Sep 17 00:00:00 2001 From: Christian Walde Date: Sun, 28 Apr 2019 14:27:31 +0100 Subject: [PATCH 1/2] inject dcchome for strawberry so all needed dlls are available for tests --- bin/configsmoke.pl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/bin/configsmoke.pl b/bin/configsmoke.pl index 00fb3da..3ee4cd3 100755 --- a/bin/configsmoke.pl +++ b/bin/configsmoke.pl @@ -2377,6 +2377,34 @@ sub default_buildcfg { "($basename is missing)!\n"; copy $dftbcfg, $file_name and print "\nCreated buildconfig '$file_name'"; + + _inject_dcchome_for_strawberry($file_name) + if is_win32 and $Config{myuname} =~ /strawberry/; +} + +sub _inject_dcchome_for_strawberry { + my ($file_name) = @_; + + my $dcchome = $^X; + $dcchome =~ s/perl.bin.perl.*$//; + $dcchome="-DCCHOME=${dcchome}c"; + print "\nStrawberry on Windows detected, injecting: '$dcchome'"; + + use autodie; + + open my $cfg_fh_r, "<:raw", $file_name; + my $body = do { local $/; <$cfg_fh_r> }; + close $cfg_fh_r; + + $body =~ s/(DCCHOME.*\n)/$1$dcchome\n/; + + chmod 0666, $file_name; + open my $cfg_fh_w, ">:raw", $file_name; + print $cfg_fh_w $body; + close $cfg_fh_w; + chmod 0550, $file_name; + + return; } =item check_buildcfg From ea2f28e979052ac1ef7891d036b1eb967be0506f Mon Sep 17 00:00:00 2001 From: Christian Walde Date: Sun, 28 Apr 2019 14:41:48 +0100 Subject: [PATCH 2/2] skip t/porting/pending-author.t by default on windows --- bin/configsmoke.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/configsmoke.pl b/bin/configsmoke.pl index 3ee4cd3..3b730be 100755 --- a/bin/configsmoke.pl +++ b/bin/configsmoke.pl @@ -1232,6 +1232,7 @@ =head1 CONFIGURATION if ($config{$arg} && !-f $config{$arg}) { if (open my $toskip, '>', $config{$arg}) { print $toskip "# One test name on a line\n"; + print $toskip "t/porting/pending-author.t\n" if is_win32; close $toskip; print "Created skeleton '$config{$arg}'...\n"; }