[svn:parrot] r36794 - trunk/tools/install

[fperrad at svn.parrot.org]

Author: fperrad
Date: Mon Feb 16 10:07:04 2009
New Revision: 36794
URL: https://trac.parrot.org/parrot/changeset/36794

Log:
[install] minor cleanup

Modified:
   trunk/tools/install/smoke.pl
   trunk/tools/install/smoke_languages.pl

Modified: trunk/tools/install/smoke.pl
==============================================================================
--- trunk/tools/install/smoke.pl	Mon Feb 16 08:55:51 2009	(r36793)
+++ trunk/tools/install/smoke.pl	Mon Feb 16 10:07:04 2009	(r36794)
@@ -89,10 +89,6 @@
            ? "lib/parrot/$version/library"
            : 'runtime/parrot/library';
 
-my $langdir = ($bindir eq 'bin')
-            ? "lib/parrot/$version/languages"
-            : 'languages';
-
 my $compdir = ($bindir eq 'bin')
             ? "lib/parrot/$version/languages"
             : 'compilers';

Modified: trunk/tools/install/smoke_languages.pl
==============================================================================
--- trunk/tools/install/smoke_languages.pl	Mon Feb 16 08:55:51 2009	(r36793)
+++ trunk/tools/install/smoke_languages.pl	Mon Feb 16 10:07:04 2009	(r36794)
@@ -124,14 +124,14 @@
 
 SKIP:
 {
-skip(".NET", 3) unless (-d "$langdir/dotnet");
+skip(".NET", 1) unless (-d "$langdir/dotnet");
 $out = `$parrot $langdir/dotnet/net2pbc.pbc`;
 ok($out =~ /^Usage/, "check dotnet");
 }
 
 SKIP:
 {
-skip("EcmaScript", 3) unless (-d "$langdir/ecmascript");
+skip("EcmaScript", 1) unless (-d "$langdir/ecmascript");
 $filename = 'test.js';
 open $FH, '>', $filename
         or die "Can't open $filename ($!).\n";
@@ -296,6 +296,7 @@
 $out = `$parrot $langdir/rakudo/perl6.pbc -e "say 'hello world'"`;
 ok($out eq "hello world\n", "check rakudo");
 
+skip("perl6.cmd", 1) if ($bindir eq '.');
 $exe = catfile($bindir, 'perl6');
 $out = `$exe -v`;
 ok($out =~ /Rakudo/, "check rakudo");