From 7ddedb42b8dd97c5e4f97f74d0787f48b3580dda Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Thu, 5 Dec 2019 14:58:53 +0100
Subject: Bump Rakudo Star version
---
tools/build/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'tools/build')
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 59f9480..9befd0c 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -3,7 +3,7 @@
MOAR_DIR = moarvm
NQP_DIR = nqp
RAKUDO_DIR = rakudo
-STAR_VERSION = 2019.07
+STAR_VERSION = 2019.11
# install location
PREFIX_DIR = @prefix@
--
cgit v1.1
From 009aa7e91793ce43e73324dad22bed9917500756 Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Thu, 5 Dec 2019 16:06:11 +0100
Subject: Skip testing phase when installing Rakudo Star
---
tools/build/module-install.pl | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'tools/build')
diff --git a/tools/build/module-install.pl b/tools/build/module-install.pl
index af6845f..eadb99e 100644
--- a/tools/build/module-install.pl
+++ b/tools/build/module-install.pl
@@ -17,9 +17,15 @@ while (<>) {
# Create the command list
my @cmd = (
- $perl6bin, $zefbin,
- '--/build-depends', '--/test-depends', '--/depends',
- '--force', 'install', "./modules$path_sep$module"
+ $perl6bin,
+ $zefbin,
+ '--/build-depends',
+ '--/depends',
+ '--/test',
+ '--/test-depends',
+ '--force',
+ 'install',
+ "./modules$path_sep$module"
);
# Show the command that's going to be ran, for debugging purposes
--
cgit v1.1
From fe8e97975194a47772ecdaef4462cd99d9e5c891 Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Thu, 5 Dec 2019 16:55:08 +0100
Subject: Update modules-test script
---
tools/build/modules-test.pl | 49 ++++++++++++++++++++++++++++++++++-----------
1 file changed, 37 insertions(+), 12 deletions(-)
(limited to 'tools/build')
diff --git a/tools/build/modules-test.pl b/tools/build/modules-test.pl
index 396f066..1c8239b 100644
--- a/tools/build/modules-test.pl
+++ b/tools/build/modules-test.pl
@@ -1,5 +1,8 @@
#! perl
+use warnings;
+use strict;
+
use Cwd;
use Getopt::Long;
@@ -9,17 +12,39 @@ my $base = shift @ARGV;
my $perl6 = shift @ARGV;
while (<>) {
- next if /^\s*(#|$)/;
- my ($moduledir) = /(\S+)/;
- print "Testing modules/$moduledir with $perl6...\n";
- if (-d "$base/modules/$moduledir/t") {
- chdir("$base/modules/$moduledir");
- system('prove', $verbose ? '-v' : (), '-e', $perl6, '-r', 't');
- }
- else {
- print "...no t/ directory found.\n";
- }
- print "\n";
+ # Skip comments
+ next if /^\s*(#|$)/;
+
+ # Extract only the module name from the current line
+ my ($moduledir) = /(\S+)/;
+
+ # Run the tests through prove
+ if (-d "$base/modules/$moduledir/t") {
+ chdir("$base/modules/$moduledir");
+
+ my @cmd = (
+ 'prove',
+ $verbose ? '-v' : (),
+ '-e', $perl6,
+ '-r',
+ 't',
+ );
+
+ # Show the command that's going to be ran, for debugging purposes
+ print "@cmd\n";
+
+ # Actually run the command
+ my $exit = system "@cmd";
+
+ # Exit early if any errors occurred
+ exit 1 if $exit;
+ }
+ else {
+ print "...no t/ directory found.\n";
+ }
+
+ print "\n";
}
-0;
+# If we reach this, no errors have been found
+exit 0;
--
cgit v1.1
From 1308da5062946cd56573894af89e98ba8ce45ac5 Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Thu, 5 Dec 2019 21:05:02 +0100
Subject: Update modules-test to show cwd
---
tools/build/modules-test.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'tools/build')
diff --git a/tools/build/modules-test.pl b/tools/build/modules-test.pl
index 1c8239b..3d70fcf 100644
--- a/tools/build/modules-test.pl
+++ b/tools/build/modules-test.pl
@@ -31,7 +31,7 @@ while (<>) {
);
# Show the command that's going to be ran, for debugging purposes
- print "@cmd\n";
+ print "[" . getcwd . "] @cmd\n";
# Actually run the command
my $exit = system "@cmd";
--
cgit v1.1
From 08eca0b69dc4ac7d9c2c0e012d441899298ca70c Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Thu, 5 Dec 2019 23:04:31 +0100
Subject: Don't reinstall modules for testing
---
tools/build/Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'tools/build')
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 9befd0c..5ce58e2 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -67,12 +67,12 @@ modules-install-m: rakudo-install
modules-test: @backend_modules_test@
verbose-modules-test: @backend_modules_test@
-modules-test-j: modules-install-j
+modules-test-j:
$(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_J_INSTALL) $(MODULES)
verbose-modules-test-j: modules-install-j
$(PERL) tools/build/modules-test.pl --verbose $(CURDIR) $(DESTDIR)$(PERL6_J_INSTALL) $(MODULES)
-modules-test-m: modules-install-m
+modules-test-m:
$(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) $(MODULES)
verbose-modules-test-m: modules-install-m
$(PERL) tools/build/modules-test.pl --verbose $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) $(MODULES)
--
cgit v1.1