diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/cut/Makefile.am | 3 | ||||
-rw-r--r-- | tests/date/Makefile.am | 7 | ||||
-rw-r--r-- | tests/head/Makefile.am | 7 | ||||
-rw-r--r-- | tests/join/Makefile.am | 7 | ||||
-rw-r--r-- | tests/pr/Makefile.am | 7 | ||||
-rw-r--r-- | tests/sort/Makefile.am | 7 | ||||
-rw-r--r-- | tests/tac/Makefile.am | 7 | ||||
-rw-r--r-- | tests/tail/Makefile.am | 7 | ||||
-rw-r--r-- | tests/test/Makefile.am | 7 | ||||
-rw-r--r-- | tests/tr/Makefile.am | 16 | ||||
-rw-r--r-- | tests/uniq/Makefile.am | 7 | ||||
-rw-r--r-- | tests/wc/Makefile.am | 7 |
12 files changed, 61 insertions, 28 deletions
diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am index 06689a7f3..08a3e404e 100644 --- a/tests/cut/Makefile.am +++ b/tests/cut/Makefile.am @@ -38,7 +38,8 @@ TESTS = $x-tests mk_script = $(srcdir)/../mk-script $(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $x > $@.n + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/date/Makefile.am b/tests/date/Makefile.am index 5904267f7..022a0f189 100644 --- a/tests/date/Makefile.am +++ b/tests/date/Makefile.am @@ -33,14 +33,17 @@ ns-relative.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/head/Makefile.am b/tests/head/Makefile.am index 62874bf4d..83e928481 100644 --- a/tests/head/Makefile.am +++ b/tests/head/Makefile.am @@ -20,14 +20,17 @@ posix-3.O posix-3.E posix-4.O posix-4.E posix-5.O posix-5.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am index d34a6750d..41edd1438 100644 --- a/tests/join/Makefile.am +++ b/tests/join/Makefile.am @@ -24,14 +24,17 @@ invalid-j.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am index 284bfd936..42fac7704 100644 --- a/tests/pr/Makefile.am +++ b/tests/pr/Makefile.am @@ -72,14 +72,17 @@ dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E narrow-1.O narrow-1.E col-last.O col-last.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am index cfadf64a9..a303f23c3 100644 --- a/tests/sort/Makefile.am +++ b/tests/sort/Makefile.am @@ -45,14 +45,17 @@ nul-nls.E use-nl.O use-nl.E o2.O o2.E nul-tab.O nul-tab.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/tac/Makefile.am b/tests/tac/Makefile.am index bd04bc159..624636cc9 100644 --- a/tests/tac/Makefile.am +++ b/tests/tac/Makefile.am @@ -21,14 +21,17 @@ opt-br.O opt-br.E opt-br2.O opt-br2.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am index 7b9b38ae7..bf903adc1 100644 --- a/tests/tail/Makefile.am +++ b/tests/tail/Makefile.am @@ -23,14 +23,17 @@ n-5.E n-5a.O n-5a.E n-5b.O n-5b.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/test/Makefile.am b/tests/test/Makefile.am index 7b8c11f92..1ffe2673e 100644 --- a/tests/test/Makefile.am +++ b/tests/test/Makefile.am @@ -99,14 +99,17 @@ paren-4.O paren-4.E paren-5.O paren-5.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am index b09ff6ffc..6b13303b8 100644 --- a/tests/tr/Makefile.am +++ b/tests/tr/Makefile.am @@ -12,7 +12,8 @@ rep-cclass.X rep-1.I rep-1.X rep-2.I rep-2.X rep-3.I rep-3.X o-rep-1.I \ o-rep-1.X o-rep-2.I o-rep-2.X esc.I esc.X ross-0a.I ross-0a.X ross-0b.I \ ross-0b.X ross-1a.I ross-1a.X ross-1b.I ross-1b.X ross-2.I ross-2.X ross-3.I \ ross-3.X ross-4.I ross-4.X ross-5.I ross-5.X ross-6.I ross-6.X empty-eq.I \ -empty-eq.X empty-cc.I empty-cc.X +empty-eq.X empty-cc.I empty-cc.X repeat-bs-9.I repeat-bs-9.X repeat-0.I \ +repeat-0.X repeat-000.I repeat-000.X repeat-compl.I repeat-compl.X run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \ 9.E a.O a.E b.O b.E c.O c.E d.O d.E e.O e.E f.O f.E g.O g.E h.O h.E i.O i.E \ j.O j.E k.O k.E l.O l.E m.O m.E n.O n.E o.O o.E p.O p.E q.O q.E r.O r.E s.O \ @@ -22,28 +23,29 @@ rep-cclass.E rep-1.O rep-1.E rep-2.O rep-2.E rep-3.O rep-3.E o-rep-1.O \ o-rep-1.E o-rep-2.O o-rep-2.E esc.O esc.E ross-0a.O ross-0a.E ross-0b.O \ ross-0b.E ross-1a.O ross-1a.E ross-1b.O ross-1b.E ross-2.O ross-2.E ross-3.O \ ross-3.E ross-4.O ross-4.E ross-5.O ross-5.E ross-6.O ross-6.E empty-eq.O \ -empty-eq.E empty-cc.O empty-cc.E +empty-eq.E empty-cc.O empty-cc.E repeat-bs-9.O repeat-bs-9.E repeat-0.O \ +repeat-0.E repeat-000.O repeat-000.E repeat-compl.O repeat-compl.E ##test-files-end EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ MAINTAINERCLEANFILES = $x-tests $(maint_gen) CLEANFILES = $(run_gen) -TESTS_ENVIRONMENT = \ - PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" - check: $(maint_gen) $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) diff --git a/tests/uniq/Makefile.am b/tests/uniq/Makefile.am index 14e803aed..c0d84b6eb 100644 --- a/tests/uniq/Makefile.am +++ b/tests/uniq/Makefile.am @@ -25,14 +25,17 @@ obs45.E 50.O 50.E 51.O 51.E 52.O 52.E 53.O 53.E 54.O 54.E 55.O 55.E 56.O 56.E \ EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ diff --git a/tests/wc/Makefile.am b/tests/wc/Makefile.am index 5a94c4a8e..78e0ef936 100644 --- a/tests/wc/Makefile.am +++ b/tests/wc/Makefile.am @@ -13,14 +13,17 @@ c2.O c2.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests +TESTS_ENVIRONMENT = \ + PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' TESTS = $x-tests mk_script = $(srcdir)/../mk-script -$(srcdir)/$x-tests: $(mk_script) Test.pm - $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n +$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am + test '$x' = test && prog=../../src/$x || prog=$x; \ + $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n mv $@.n $@ chmod 755 $@ |