Author: bernhard
Date: Sat Oct 29 03:55:43 2005
New Revision: 9624

Modified:
   trunk/CREDITS
   trunk/MANIFEST.SKIP
   trunk/languages/ook/   (props changed)
   trunk/languages/ook/t/basic.t
Log:
Make 'languages/ook' happy WRT smoke testing.


Modified: trunk/CREDITS
==============================================================================
--- trunk/CREDITS       (original)
+++ trunk/CREDITS       Sat Oct 29 03:55:43 2005
@@ -400,7 +400,7 @@ E: [EMAIL PROTECTED]
 W: http://www.accognoscere.org
 S: Winterthur, Switzerland
 
-N: Stig Brantaset
+N: Stig Brautaset
 D: Patch to repair 'make clean'
 
 N: Thilo Planz

Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Sat Oct 29 03:55:43 2005
@@ -1,5 +1,5 @@
 # $Id$
-# generated by gen_manifest_skip.pl Fri Oct 28 00:02:24 2005
+# generated by gen_manifest_skip.pl Sat Oct 29 05:09:23 2005
 #
 # Please update t/src/manifest.t when adding patterns here
 \B\.svn\b
@@ -154,6 +154,7 @@
 # generated from svn:ignore of 'config/init/'
 # generated from svn:ignore of 'config/init/hints/'
 # generated from svn:ignore of 'config/inter/'
+# generated from svn:ignore of 'debian/'
 # generated from svn:ignore of 'docs/'
 ^docs/.*\.tmp$
 ^docs/.*\.tmp/
@@ -166,6 +167,95 @@
 ^docs/packfile-perl\.pod$
 ^docs/packfile-perl\.pod/
 # generated from svn:ignore of 'docs/dev/'
+# generated from svn:ignore of 'docs/html/'
+# generated from svn:ignore of 'docs/html/build_tools/'
+# generated from svn:ignore of 'docs/html/classes/'
+# generated from svn:ignore of 'docs/html/config/auto/'
+# generated from svn:ignore of 'docs/html/config/gen/'
+# generated from svn:ignore of 'docs/html/config/init/'
+# generated from svn:ignore of 'docs/html/config/inter/'
+# generated from svn:ignore of 'docs/html/docs/'
+# generated from svn:ignore of 'docs/html/docs/dev/'
+# generated from svn:ignore of 'docs/html/docs/pdds/'
+# generated from svn:ignore of 'docs/html/docs/pmc/'
+# generated from svn:ignore of 'docs/html/dynclasses/'
+# generated from svn:ignore of 'docs/html/dynoplibs/'
+# generated from svn:ignore of 'docs/html/editor/'
+# generated from svn:ignore of 'docs/html/encodings/'
+# generated from svn:ignore of 'docs/html/examples/assembly/'
+# generated from svn:ignore of 'docs/html/examples/benchmarks/'
+# generated from svn:ignore of 'docs/html/examples/c/'
+# generated from svn:ignore of 'docs/html/examples/io/'
+# generated from svn:ignore of 'docs/html/examples/mops/'
+# generated from svn:ignore of 'docs/html/examples/pni/'
+# generated from svn:ignore of 'docs/html/examples/streams/'
+# generated from svn:ignore of 'docs/html/examples/subs/'
+# generated from svn:ignore of 'docs/html/imcc/docs/'
+# generated from svn:ignore of 'docs/html/imcc/t/syn/'
+# generated from svn:ignore of 'docs/html/io/'
+# generated from svn:ignore of 'docs/html/languages/conversion/examples/'
+# generated from svn:ignore of 'docs/html/languages/forth/'
+# generated from svn:ignore of 'docs/html/languages/jako/docs/'
+# generated from svn:ignore of 'docs/html/languages/jako/lib/Jako/Construct/'
+# generated from svn:ignore of 'docs/html/languages/m4/'
+# generated from svn:ignore of 'docs/html/languages/m4/M4/'
+# generated from svn:ignore of 'docs/html/languages/m4/Perl5/lib/Language/'
+# generated from svn:ignore of 'docs/html/languages/m4/Perl5/lib/Language/m4/'
+# generated from svn:ignore of 'docs/html/languages/m4/doc/'
+# generated from svn:ignore of 'docs/html/languages/m4/examples/'
+# generated from svn:ignore of 'docs/html/languages/m4/src/'
+# generated from svn:ignore of 'docs/html/languages/m4/t/'
+# generated from svn:ignore of 'docs/html/languages/m4/tools/'
+# generated from svn:ignore of 'docs/html/languages/miniperl/Miniperl/'
+# generated from svn:ignore of 
'docs/html/languages/parrot_compiler/lib/Parrot/Test/'
+# generated from svn:ignore of 'docs/html/languages/parrot_compiler/t/'
+# generated from svn:ignore of 'docs/html/languages/perl6/P6C/'
+# generated from svn:ignore of 'docs/html/languages/perl6/P6C/IMCC/'
+# generated from svn:ignore of 'docs/html/languages/perl6/P6C/IMCC/ExtRegex/'
+# generated from svn:ignore of 'docs/html/languages/perl6/P6C/Tree/'
+# generated from svn:ignore of 'docs/html/languages/perl6/doc/'
+# generated from svn:ignore of 'docs/html/languages/perl6/perl6re/'
+# generated from svn:ignore of 'docs/html/languages/python/t/'
+# generated from svn:ignore of 'docs/html/languages/regex/docs/'
+# generated from svn:ignore of 'docs/html/languages/regex/lib/Regex/'
+# generated from svn:ignore of 'docs/html/languages/regex/lib/Regex/Parse/'
+# generated from svn:ignore of 'docs/html/languages/ruby/Yacc/'
+# generated from svn:ignore of 'docs/html/languages/scheme/Scheme/'
+# generated from svn:ignore of 'docs/html/languages/tcl/'
+# generated from svn:ignore of 'docs/html/languages/tcl/docs/'
+# generated from svn:ignore of 'docs/html/languages/tcl/lib/'
+# generated from svn:ignore of 'docs/html/languages/tcl/lib/commands/'
+# generated from svn:ignore of 'docs/html/languages/tcl/t/'
+# generated from svn:ignore of 'docs/html/lib/Parrot/'
+# generated from svn:ignore of 'docs/html/lib/Parrot/Configure/'
+# generated from svn:ignore of 'docs/html/lib/Parrot/Docs/'
+# generated from svn:ignore of 'docs/html/lib/Parrot/Docs/Section/'
+# generated from svn:ignore of 'docs/html/lib/Parrot/IO/'
+# generated from svn:ignore of 'docs/html/lib/Parrot/OpLib/'
+# generated from svn:ignore of 'docs/html/lib/Parrot/OpTrans/'
+# generated from svn:ignore of 'docs/html/ops/'
+# generated from svn:ignore of 'docs/html/pf/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/include/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/library/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/library/Data/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/library/Data/Dumper/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/library/Digest/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/library/Getopt/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/library/PGE/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/library/SDL/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/library/Stream/'
+# generated from svn:ignore of 'docs/html/runtime/parrot/library/YAML/Parser/'
+# generated from svn:ignore of 'docs/html/src/'
+# generated from svn:ignore of 'docs/html/t/'
+# generated from svn:ignore of 'docs/html/t/native_pbc/'
+# generated from svn:ignore of 'docs/html/t/op/'
+# generated from svn:ignore of 'docs/html/t/pmc/'
+# generated from svn:ignore of 'docs/html/t/src/'
+# generated from svn:ignore of 'docs/html/t/stress/'
+# generated from svn:ignore of 'docs/html/tools/dev/'
+# generated from svn:ignore of 'docs/html/tools/docs/'
+# generated from svn:ignore of 'docs/html/types/'
+# generated from svn:ignore of 'docs/html/util/'
 # generated from svn:ignore of 'docs/ops/'
 ^docs/ops/.*\.pod$
 ^docs/ops/.*\.pod/
@@ -499,6 +589,8 @@
 ^languages/ook/Makefile/
 ^languages/ook/.*\.pbc$
 ^languages/ook/.*\.pbc/
+^languages/ook/hello\.out$
+^languages/ook/hello\.out/
 # generated from svn:ignore of 'languages/ook/t/'
 # generated from svn:ignore of 'languages/parakeet/'
 # generated from svn:ignore of 'languages/parrot_compiler/'

Modified: trunk/languages/ook/t/basic.t
==============================================================================
--- trunk/languages/ook/t/basic.t       (original)
+++ trunk/languages/ook/t/basic.t       Sat Oct 29 03:55:43 2005
@@ -1,33 +1,38 @@
 #! perl -w
 # $Id$
 
-use Data::Dumper;
-use Test::More tests => 1;
-use Parrot::Test;
-
+use strict;
+use warnings;
 use FindBin;
+use lib "$FindBin::Bin/../../../lib";
+
+use Test::More tests => 1;
+use Parrot::Test();
+use Parrot::Config qw(%PConfig);
+use File::Spec;
 
 # execute hello.ook
-my $language_dir = $FindBin::Bin . '/..'; 
-my $parrot       = "../../parrot";
+my $updir         = File::Spec->updir();
+my $languages_dir = File::Spec->catdir( $FindBin::Bin, $updir, $updir ); 
+my $parrot        = File::Spec->catfile( $updir, 'parrot' . $PConfig{exe} );
 
-# flatten filenames (don't use directories)
-my $out_f = 'hello.out';
+# Test running hello.ook
+
+my $out_fn = File::Spec->catfile( 'ook', 'hello.out' );
 
 # STDERR is written into same output file
 my $exit_code = Parrot::Test::run_command( 
-    "$parrot ook.pbc hello.ook",
-    CD     => $language_dir,
-    STDOUT => $out_f,
-    STDERR => $out_f 
-        );
+    "$parrot ook/ook.pbc ook/hello.ook",
+    CD     => $languages_dir,
+    STDOUT => $out_fn,
+    STDERR => $out_fn 
+                                         );
   
-
-is( Parrot::Test::slurp_file($out_f), << 'OUT', 'output from hello.ook' );
+my $out = Parrot::Test::slurp_file(
+                    File::Spec->catfile($languages_dir, $out_fn)
+                                  );
+is( $out, << 'OUT', 'output from hello.ook' );
 Hello World!
 OUT
 
-# clean up
-unlink( $out_f );
-
-# TODO: test executing hello.ook
+# TODO: test executing test.ook

Reply via email to