Author: bernhard
Date: Sun Jun 12 02:50:50 2005
New Revision: 8317
Added:
trunk/languages/m4/lib/
trunk/languages/m4/lib/Parrot/
trunk/languages/m4/lib/Parrot/Test/
trunk/languages/m4/lib/Parrot/Test/m4.pm
Removed:
trunk/languages/m4/M4/Changes
trunk/languages/m4/M4/MANIFEST
trunk/languages/m4/M4/Makefile.PL
trunk/languages/m4/M4/README
trunk/languages/m4/M4/Test.pm
trunk/languages/m4/M4/t/
trunk/languages/m4/Perl5/
trunk/lib/Parrot/Test/m4.pm
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/docs/extend.pod
trunk/editor/ (props changed)
trunk/languages/LANGUAGES.STATUS
trunk/languages/m4/ChangeLog
trunk/languages/m4/README
trunk/languages/m4/VERSION
trunk/languages/m4/src/m4.pir
trunk/languages/m4/t/basic/001_comletely_empty.t
trunk/languages/m4/t/basic/002_hello.t
trunk/languages/m4/t/basic/003_getopt.t
trunk/languages/m4/t/basic/004_define.t
trunk/languages/m4/t/basic/005_define_with_blanks.t
trunk/languages/m4/t/basic/006_define_with_rest.t
trunk/languages/m4/t/basic/007_empty_line.t
trunk/languages/m4/t/basic/008_two_tests.t
trunk/languages/m4/t/basic/009_token_simple.t
trunk/languages/m4/t/basic/010_token_string.t
trunk/languages/m4/t/basic/011_recursion.t
trunk/languages/m4/t/basic/012_eval.t
trunk/languages/m4/t/builtins/001_all.t
trunk/languages/m4/t/builtins/002_define.t
trunk/languages/m4/t/builtins/003_index.t
trunk/languages/m4/t/builtins/004_len.t
trunk/languages/m4/t/builtins/005_substr.t
trunk/languages/m4/t/builtins/006_format.t
trunk/languages/m4/t/builtins/007_decr.t
trunk/languages/m4/t/builtins/008_incr.t
trunk/languages/m4/t/builtins/009_syscmd.t
trunk/languages/m4/t/builtins/010_sysval.t
trunk/languages/m4/t/builtins/011_eval.t
trunk/languages/m4/t/builtins/012_undefine.t
trunk/languages/m4/t/builtins/013_ifdef.t
trunk/languages/m4/t/builtins/014_ifelse.t
trunk/languages/m4/t/builtins/015___file__.t
trunk/languages/m4/t/builtins/016___line__.t
trunk/languages/m4/t/builtins/017_printerr.t
trunk/languages/m4/t/freezing/001_freeze.t
trunk/languages/m4/t/freezing/002_many_files.t
trunk/languages/m4/t/regex/001_pcre.t
trunk/languages/m4/t/regex/002_tokens.t
trunk/languages/m4/t/regex/003_two_compiles.t
trunk/languages/m4/t/regex/004_pge.t
Log:
- Tell MANIFEST about new file docs/extend.pod
- Tell MANIFEST.SKIP and svn:ignore about the generated file 'editor/Makefile'
- Move Parrot::Test::m4 from lib to 'languages/m4/lib'
Thanks to Thomas Klausner for hit talk at the Austrian Perl Workshop
for reminding me about 'FindBin'
- Clean up old cruft in 'lnaguages/m4'.s
The plan to do m4 in Perl5 has been given up.
- Parrot m4 0.0.12
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Sun Jun 12 02:50:50 2005
@@ -316,6 +316,7 @@ docs/dev/nanoparrot.c
docs/dev/pmc_freeze.pod [devel]doc
docs/dev/rx.dev [main]doc
docs/embed.pod [main]doc
+docs/extend.pod [main]doc
docs/faq.pod [main]doc
docs/gettingstarted.pod [main]doc
docs/glossary.pod [main]doc
@@ -1021,26 +1022,7 @@ languages/m4/BUGS
languages/m4/ChangeLog [m4]
languages/m4/INSTALL [m4]
languages/m4/LICENSE [m4]
-languages/m4/M4/Changes [m4]
-languages/m4/M4/MANIFEST [m4]
-languages/m4/M4/Makefile.PL [m4]
-languages/m4/M4/README [m4]
-languages/m4/M4/Test.pm [m4]
-languages/m4/M4/t/1.t [m4]
languages/m4/MAINTAINER [m4]
-languages/m4/Perl5/Build.PL [m4]
-languages/m4/Perl5/Changes [m4]
-languages/m4/Perl5/LICENSE [m4]
-languages/m4/Perl5/MANIFEST [m4]
-languages/m4/Perl5/README [m4]
-languages/m4/Perl5/Todo [m4]
-languages/m4/Perl5/lib/Language/m4.pm [m4]
-languages/m4/Perl5/lib/Language/m4/Builtin.pm [m4]
-languages/m4/Perl5/lib/Language/m4/Freeze.pm [m4]
-languages/m4/Perl5/lib/Language/m4/Input.pm [m4]
-languages/m4/Perl5/lib/Language/m4/Macro.pm [m4]
-languages/m4/Perl5/lib/Language/m4/Symtab.pm [m4]
-languages/m4/Perl5/t/001_compile.t [m4]
languages/m4/README [m4]
languages/m4/TODO.pod [m4]
languages/m4/VERSION [m4]
@@ -1055,6 +1037,7 @@ languages/m4/examples/hello.m4
languages/m4/examples/nesting.m4 [m4]
languages/m4/examples/only_T7_0.frozen [m4]
languages/m4/examples/only_builtin.frozen [m4]
+languages/m4/lib/Parrot/Test/m4.pm [m4]
languages/m4/m4.pl [m4]
languages/m4/src/builtin.pir [m4]
languages/m4/src/eval.c [m4]
@@ -1497,7 +1480,6 @@ lib/Parrot/Test.pm
lib/Parrot/Test/PGE.pm [devel]
lib/Parrot/Test/Python.pm [devel]
lib/Parrot/Test/Tcl.pm [devel]
-lib/Parrot/Test/m4.pm [devel]
lib/Parrot/Vtable.pm [devel]
lib/Parse/RecDescent.pm [devel]
lib/Pod/Escapes.pm [devel]
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Sun Jun 12 02:50:50 2005
@@ -271,6 +271,7 @@
^dynoplibs/Makefile$
^dynoplibs/Makefile/
# generated from svn:ignore of 'editor/'
+^editor/Makefile$
# generated from svn:ignore of 'encodings/'
^encodings/.*.o$
^encodings/.*.o/
Modified: trunk/docs/extend.pod
==============================================================================
--- trunk/docs/extend.pod (original)
+++ trunk/docs/extend.pod Sun Jun 12 02:50:50 2005
@@ -1,4 +1,4 @@
-# Copyright: 2001-2005 The Perl Foundation. All rights reserved.
+# Copyright: 2005 The Perl Foundation. All rights reserved.
# $Id$
=head1 NAME
Modified: trunk/languages/LANGUAGES.STATUS
==============================================================================
--- trunk/languages/LANGUAGES.STATUS (original)
+++ trunk/languages/LANGUAGES.STATUS Sun Jun 12 02:50:50 2005
@@ -166,7 +166,7 @@ A: Jeffrey Goff
A: Juergen Boemmels
S: Functioning, as far as implemented. Lists and functions are working
S: but many functions are missing implementation.
-S: Two test failures on Mac OS X
+S: Two test failures on Mac OS X and Linux
M: Yes
V: 0.0.11
Modified: trunk/languages/m4/ChangeLog
==============================================================================
--- trunk/languages/m4/ChangeLog (original)
+++ trunk/languages/m4/ChangeLog Sun Jun 12 02:50:50 2005
@@ -1,5 +1,9 @@
# $Id$
+2005-06-12 Bernhard Schmalhofer
+ * Move Parrot::Test::m4 to 'languages/m4/lib'
+ * Yank it up to 0.0.12
+
2005-04-27 Bernhard Schmalhofer
* Adapt to changes in Packfile management
Modified: trunk/languages/m4/README
==============================================================================
--- trunk/languages/m4/README (original)
+++ trunk/languages/m4/README Sun Jun 12 02:50:50 2005
@@ -8,7 +8,7 @@ a drop in replacement for GNU m4.
The purpose of the port is firstly educational,
and secondly a test case for more involved languages.
-Actually I found that m4 is already pretty involved
+Actually I found that m4 is already pretty involved.
LICENSE:
Modified: trunk/languages/m4/VERSION
==============================================================================
--- trunk/languages/m4/VERSION (original)
+++ trunk/languages/m4/VERSION Sun Jun 12 02:50:50 2005
@@ -1,3 +1,3 @@
# $Id$
-0.0.11
+Parrot m4 0.0.12
Added: trunk/languages/m4/lib/Parrot/Test/m4.pm
==============================================================================
--- (empty file)
+++ trunk/languages/m4/lib/Parrot/Test/m4.pm Sun Jun 12 02:50:50 2005
@@ -0,0 +1,87 @@
+# $Id: m4.pm 7964 2005-05-03 21:14:35Z bernhard $
+
+package Parrot::Test::m4;
+
+use strict;
+
+use Data::Dumper;
+use File::Basename;
+
+require Parrot::Test;
+
+=head1 NAME
+
+Test/m4.pm - Testing routines specific to 'm4'.
+
+=head1 DESCRIPTION
+
+Call 'Parrot m4' and 'GNU m4'.
+
+=head1 METHODS
+
+=head2 new
+
+Yet another constructor.
+
+=cut
+
+sub new {
+ return bless {};
+}
+
+my %language_test_map = (
+ output_is => 'is_eq',
+ output_like => 'like',
+ output_isnt => 'isnt_eq'
+ );
+
+foreach my $func ( keys %language_test_map ) {
+ no strict 'refs';
+
+ *{"Parrot::Test::m4::$func"} = sub ($$;$) {
+ my $self = shift;
+ my ( $code, $output, $desc ) = @_;
+
+ my $count = $self->{builder}->current_test + 1;
+
+ # flatten filenames (don't use directories)
+ my $lang_f = Parrot::Test::per_test( '.m4', $count );
+ my $m4_out_f = Parrot::Test::per_test( $ENV{PARROT_M4_TEST_PROG}
? '.gnu_out' : '.parrot_out', $count );
+ my $test_prog_args = $ENV{TEST_PROG_ARGS} || '';
+ my $test_prog = $ENV{PARROT_M4_TEST_PROG} ||
+ "$self->{parrot} languages/m4/m4.pbc";
+ $test_prog .= " ${test_prog_args} languages/${lang_f}";
+ # die Dumper( $test_prog, \%ENV );
+
+ # This does nor create byte code, but m4 code
+ my $parrotdir = dirname( $self->{parrot} );
+ Parrot::Test::generate_code( $code, $parrotdir, $count, $lang_f );
+
+ # STDERR is written into same output file
+ my $exit_code = Parrot::Test::run_command(
+ $test_prog,
+ CD => $self->{relpath},
+ STDOUT => $m4_out_f, STDERR => $m4_out_f
+ );
+
+ my $builder_func = $language_test_map{$func};
+ # That's the reason for: no strict 'refs';
+ my $pass = $self->{builder}->$builder_func(
+ Parrot::Test::slurp_file($m4_out_f),
+ $output,
+ $desc
+ );
+ unless ( $pass ) {
+ my $diag = '';
+ $diag .= "'$test_prog' failed with exit code $exit_code." if
$exit_code;
+ $self->{builder}->diag( $diag ) if $diag;
+ }
+
+ # The generated files are left in the t/* directories.
+ # Let 'make clean' and '.cvsignore' take care of them.
+
+ return $pass;
+ }
+}
+
+1;
Modified: trunk/languages/m4/src/m4.pir
==============================================================================
--- trunk/languages/m4/src/m4.pir (original)
+++ trunk/languages/m4/src/m4.pir Sun Jun 12 02:50:50 2005
@@ -120,7 +120,7 @@ Looks at the command line arguments and
# Was '--version' passed ?
is_defined = defined opt["version"]
unless is_defined goto NO_VERSION_FLAG
- print "Parrot m4 0.0.11\n"
+ print "Parrot m4 0.0.12\n"
end
NO_VERSION_FLAG:
Modified: trunk/languages/m4/t/basic/001_comletely_empty.t
==============================================================================
--- trunk/languages/m4/t/basic/001_comletely_empty.t (original)
+++ trunk/languages/m4/t/basic/001_comletely_empty.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/basic/002_hello.t
==============================================================================
--- trunk/languages/m4/t/basic/002_hello.t (original)
+++ trunk/languages/m4/t/basic/002_hello.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 3;
Modified: trunk/languages/m4/t/basic/003_getopt.t
==============================================================================
--- trunk/languages/m4/t/basic/003_getopt.t (original)
+++ trunk/languages/m4/t/basic/003_getopt.t Sun Jun 12 02:50:50 2005
@@ -1,7 +1,8 @@
# $Id$
-# pragmata
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Test::More tests => 25;
@@ -32,7 +33,7 @@ END_OUT
#--------------------------------------------
$real_out = `$parrot_m4 --version 2>&1`;
is( $real_out, << 'END_OUT', '--version' );
-Parrot m4 0.0.11
+Parrot m4 0.0.12
END_OUT
Modified: trunk/languages/m4/t/basic/004_define.t
==============================================================================
--- trunk/languages/m4/t/basic/004_define.t (original)
+++ trunk/languages/m4/t/basic/004_define.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 4;
Modified: trunk/languages/m4/t/basic/005_define_with_blanks.t
==============================================================================
--- trunk/languages/m4/t/basic/005_define_with_blanks.t (original)
+++ trunk/languages/m4/t/basic/005_define_with_blanks.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 4;
Modified: trunk/languages/m4/t/basic/006_define_with_rest.t
==============================================================================
--- trunk/languages/m4/t/basic/006_define_with_rest.t (original)
+++ trunk/languages/m4/t/basic/006_define_with_rest.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 2;
Modified: trunk/languages/m4/t/basic/007_empty_line.t
==============================================================================
--- trunk/languages/m4/t/basic/007_empty_line.t (original)
+++ trunk/languages/m4/t/basic/007_empty_line.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/basic/008_two_tests.t
==============================================================================
--- trunk/languages/m4/t/basic/008_two_tests.t (original)
+++ trunk/languages/m4/t/basic/008_two_tests.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 2;
Modified: trunk/languages/m4/t/basic/009_token_simple.t
==============================================================================
--- trunk/languages/m4/t/basic/009_token_simple.t (original)
+++ trunk/languages/m4/t/basic/009_token_simple.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 5;
Modified: trunk/languages/m4/t/basic/010_token_string.t
==============================================================================
--- trunk/languages/m4/t/basic/010_token_string.t (original)
+++ trunk/languages/m4/t/basic/010_token_string.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 2;
Modified: trunk/languages/m4/t/basic/011_recursion.t
==============================================================================
--- trunk/languages/m4/t/basic/011_recursion.t (original)
+++ trunk/languages/m4/t/basic/011_recursion.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1 + 1;
Modified: trunk/languages/m4/t/basic/012_eval.t
==============================================================================
--- trunk/languages/m4/t/basic/012_eval.t (original)
+++ trunk/languages/m4/t/basic/012_eval.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Test::More tests => 1;
Modified: trunk/languages/m4/t/builtins/001_all.t
==============================================================================
--- trunk/languages/m4/t/builtins/001_all.t (original)
+++ trunk/languages/m4/t/builtins/001_all.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 2;
Modified: trunk/languages/m4/t/builtins/002_define.t
==============================================================================
--- trunk/languages/m4/t/builtins/002_define.t (original)
+++ trunk/languages/m4/t/builtins/002_define.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/builtins/003_index.t
==============================================================================
--- trunk/languages/m4/t/builtins/003_index.t (original)
+++ trunk/languages/m4/t/builtins/003_index.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 9;
Modified: trunk/languages/m4/t/builtins/004_len.t
==============================================================================
--- trunk/languages/m4/t/builtins/004_len.t (original)
+++ trunk/languages/m4/t/builtins/004_len.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 3;
Modified: trunk/languages/m4/t/builtins/005_substr.t
==============================================================================
--- trunk/languages/m4/t/builtins/005_substr.t (original)
+++ trunk/languages/m4/t/builtins/005_substr.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 4;
Modified: trunk/languages/m4/t/builtins/006_format.t
==============================================================================
--- trunk/languages/m4/t/builtins/006_format.t (original)
+++ trunk/languages/m4/t/builtins/006_format.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 3;
Modified: trunk/languages/m4/t/builtins/007_decr.t
==============================================================================
--- trunk/languages/m4/t/builtins/007_decr.t (original)
+++ trunk/languages/m4/t/builtins/007_decr.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 7 + 2;
Modified: trunk/languages/m4/t/builtins/008_incr.t
==============================================================================
--- trunk/languages/m4/t/builtins/008_incr.t (original)
+++ trunk/languages/m4/t/builtins/008_incr.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 7 + 2;
Modified: trunk/languages/m4/t/builtins/009_syscmd.t
==============================================================================
--- trunk/languages/m4/t/builtins/009_syscmd.t (original)
+++ trunk/languages/m4/t/builtins/009_syscmd.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/builtins/010_sysval.t
==============================================================================
--- trunk/languages/m4/t/builtins/010_sysval.t (original)
+++ trunk/languages/m4/t/builtins/010_sysval.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1 + 1;
Modified: trunk/languages/m4/t/builtins/011_eval.t
==============================================================================
--- trunk/languages/m4/t/builtins/011_eval.t (original)
+++ trunk/languages/m4/t/builtins/011_eval.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 3;
Modified: trunk/languages/m4/t/builtins/012_undefine.t
==============================================================================
--- trunk/languages/m4/t/builtins/012_undefine.t (original)
+++ trunk/languages/m4/t/builtins/012_undefine.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/builtins/013_ifdef.t
==============================================================================
--- trunk/languages/m4/t/builtins/013_ifdef.t (original)
+++ trunk/languages/m4/t/builtins/013_ifdef.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/builtins/014_ifelse.t
==============================================================================
--- trunk/languages/m4/t/builtins/014_ifelse.t (original)
+++ trunk/languages/m4/t/builtins/014_ifelse.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/builtins/015___file__.t
==============================================================================
--- trunk/languages/m4/t/builtins/015___file__.t (original)
+++ trunk/languages/m4/t/builtins/015___file__.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/builtins/016___line__.t
==============================================================================
--- trunk/languages/m4/t/builtins/016___line__.t (original)
+++ trunk/languages/m4/t/builtins/016___line__.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/builtins/017_printerr.t
==============================================================================
--- trunk/languages/m4/t/builtins/017_printerr.t (original)
+++ trunk/languages/m4/t/builtins/017_printerr.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/freezing/001_freeze.t
==============================================================================
--- trunk/languages/m4/t/freezing/001_freeze.t (original)
+++ trunk/languages/m4/t/freezing/001_freeze.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Test::More tests => 1;
Modified: trunk/languages/m4/t/freezing/002_many_files.t
==============================================================================
--- trunk/languages/m4/t/freezing/002_many_files.t (original)
+++ trunk/languages/m4/t/freezing/002_many_files.t Sun Jun 12 02:50:50 2005
@@ -1,6 +1,8 @@
# $Id$
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Test::More tests => 3;
Modified: trunk/languages/m4/t/regex/001_pcre.t
==============================================================================
--- trunk/languages/m4/t/regex/001_pcre.t (original)
+++ trunk/languages/m4/t/regex/001_pcre.t Sun Jun 12 02:50:50 2005
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/../../../../lib";
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/regex/002_tokens.t
==============================================================================
--- trunk/languages/m4/t/regex/002_tokens.t (original)
+++ trunk/languages/m4/t/regex/002_tokens.t Sun Jun 12 02:50:50 2005
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/../../../../lib";
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 5;
use Parrot::Test::PGE;
Modified: trunk/languages/m4/t/regex/003_two_compiles.t
==============================================================================
--- trunk/languages/m4/t/regex/003_two_compiles.t (original)
+++ trunk/languages/m4/t/regex/003_two_compiles.t Sun Jun 12 02:50:50 2005
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/../../../../lib";
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
Modified: trunk/languages/m4/t/regex/004_pge.t
==============================================================================
--- trunk/languages/m4/t/regex/004_pge.t (original)
+++ trunk/languages/m4/t/regex/004_pge.t Sun Jun 12 02:50:50 2005
@@ -2,10 +2,9 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/../../../../lib";
+use lib "$FindBin::Bin/../../lib", "$FindBin::Bin/../../../../lib";
use Parrot::Test tests => 1;
-use Test::More;
# Check the functionality of the Parrot Grammat Engine needed by Parrot m4
