Fix up stuff for GLR

laben · Aug 19, 2015 · f578a30 · niner · Aug 25, 2015 · f578a30
1 parent e01eed2
commit f578a30
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/Panda/Builder.pm b/lib/Panda/Builder.pm
@@ -115,7 +115,7 @@ method build($where, :$bone, :@deps) {
                     @pargs.unshift: "-M" ~ $dep;
                 }
 
-                my ( :$output, :$stdout, :$stderr, :$passed ) := run-and-gather-output($*EXECUTABLE, @pargs);
+                my ( :$output, :$stdout, :$stderr, :$passed ) = run-and-gather-output($*EXECUTABLE, @pargs);
 
                 if $bone {
                     $bone.build-output = $output;

diff --git a/lib/Panda/Installer.pm b/lib/Panda/Installer.pm
@@ -9,7 +9,7 @@ has $.destdir = self.default-destdir();
 method sort-lib-contents(@lib) {
     my @generated = @lib.grep({ $_ ~~  / \. <{compsuffix}> $/});
     my @rest = @lib.grep({ $_ !~~ / \. <{compsuffix}> $/});
-    return @rest, @generated;
+    return flat @rest, @generated;
 }
 
 # default install location

diff --git a/lib/Panda/Tester.pm b/lib/Panda/Tester.pm
@@ -21,7 +21,7 @@ method test($where, :$bone, :$prove-command = $*DISTRO.name eq 'mswin32' ?? 'pro
                 for @deps -> $lib {
                     $libs ~= ' -M' ~ $lib;
                 }
-                my ( :$output, :$stdout, :$stderr, :$passed ) := run-and-gather-output($prove-command, '-e', "$*EXECUTABLE $libs -Ilib", '-r', 't/');
+                my ( :$output, :$stdout, :$stderr, :$passed ) = run-and-gather-output($prove-command, '-e', "$*EXECUTABLE $libs -Ilib", '-r', 't/');
 
                 if $bone {
                     $bone.test-output = $output;
@@ -30,7 +30,7 @@ method test($where, :$bone, :$prove-command = $*DISTRO.name eq 'mswin32' ?? 'pro
                     $bone.test-passed = $passed;
                 }
 
-                fail "Tests failed" unless $passed;
+                fail "Tests failed" unless $passed.value;
             }
         }
     };

diff --git a/t/installer.t b/t/installer.t
@@ -27,7 +27,7 @@ my @lib = 'foo.pm', 'foo.' ~ compsuffix, 'bam.' ~ compsuffix,
           'bam.pm', 'blaz.pm', 'blaz.' ~ compsuffix, 'shazam.js';
 my @order = Panda::Installer.sort-lib-contents(@lib);
 is-deeply @order,
-          [<foo.pm bam.pm blaz.pm shazam.js>, 
+          [flat <foo.pm bam.pm blaz.pm shazam.js>,
           'foo.' ~ compsuffix, 'bam.' ~ compsuffix, 'blaz.' ~ compsuffix],
           "{compsuffix}s will get installed after rest of the things";