diff options
| author | Ilya Zakharevich <ilya@math.berkeley.edu> | 2001-07-23 14:20:35 -0400 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-07-23 22:52:02 +0000 |
| commit | 1167a30e646ca68516b6d6fe00c979246aa8df3a (patch) | |
| tree | 52f2acf84b86888ebb5fe7ff218ff3300cb23ef0 /Makefile.SH | |
| parent | c3be8c6e992cd429c91bc2f69757e27ca402e340 (diff) | |
| download | perl-1167a30e646ca68516b6d6fe00c979246aa8df3a.tar.gz | |
OPTIMIZE= during perl make
Message-ID: <20010723182035.A14192@math.ohio-state.edu>
p4raw-id: //depot/perl@11459
Diffstat (limited to 'Makefile.SH')
| -rw-r--r-- | Makefile.SH | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/Makefile.SH b/Makefile.SH index 2df7ac8c6d..340b736ecb 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -227,9 +227,9 @@ TRNL = '$trnl' ## In the following dollars and backticks do not need the extra backslash. $spitshell >>Makefile <<'!NO!SUBS!' -CCCMD = `sh $(shellflags) cflags $(LIBPERL) $@` +CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $@` -CCCMDSRC = `sh $(shellflags) cflags $(LIBPERL) $<` +CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $<` private = preplibrary lib/ExtUtils/Miniperl.pm lib/Config.pm @@ -946,7 +946,7 @@ depend: makedepend makedepend: makedepend.SH config.sh sh ./makedepend.SH -.PHONY: test check test_prep _test_prep \ +.PHONY: test check test_prep test_prep_nodll test_prep_pre _test_prep \ test_tty test-tty _test_tty test_notty test-notty _test_notty \ utest ucheck test.utf8 check.utf8 \ test.third check.third utest.third ucheck.third test_notty.third \ @@ -956,25 +956,31 @@ makedepend: makedepend.SH config.sh # Cannot delegate rebuilding of t/perl to make # to allow interlaced test and minitest -_test_prep: $(PERL)$(EXE_EXT) +TESTFILE=TEST + +_test_prep: cd t && (rm -f $(PERL)$(EXE_EXT); $(LNS) ../$(PERL)$(EXE_EXT) $(PERL)$(EXE_EXT)) -test_prep: miniperl ./perl$(EXE_EXT) preplibrary utilities $(dynamic_ext) $(nonxs_ext) $(TEST_PERL_DLL) +# Architecture-neutral stuff: + +test_prep_pre: preplibrary utilities $(nonxs_ext) + +test_prep: test_prep_pre miniperl ./perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) PERL=./perl $(MAKE) _test_prep _test_tty: - cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) TEST $(TEST_ARGS) </dev/tty + cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) $(TESTFILE) $(TEST_ARGS) </dev/tty _test_notty: - cd t && $(LDLIBPTH) $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(PERL) TEST $(TEST_ARGS) + cd t && $(LDLIBPTH) $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(PERL) $(TESTFILE) $(TEST_ARGS) # The second branch is for testing without a tty or controlling terminal, # see t/op/stat.t _test: if (true </dev/tty) >/dev/null 2>&1; then \ - $(MAKE) TEST_ARGS=$(TEST_ARGS) _test_tty ; \ + $(MAKE) TEST_ARGS=$(TEST_ARGS) TESTFILE=$(TESTFILE) _test_tty ; \ else \ - $(MAKE) TEST_ARGS=$(TEST_ARGS) _test_notty ; \ + $(MAKE) TEST_ARGS=$(TEST_ARGS) TESTFILE=$(TESTFILE) _test_notty ; \ fi @echo "Ran tests" > t/rantests @@ -998,7 +1004,7 @@ test-notty: test_notty # Targets for Third Degree testing. -test_prep.third: test_prep perl.third +test_prep.third: test_prep perl.third perl.third$(EXE_EXT) PERL=./perl.third $(MAKE) _test_prep test.third check.third: test_prep.third perl.third @@ -1026,6 +1032,11 @@ minitest: miniperl lib/re.pm - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ && $(LDLIBPTH) ./perl TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t </dev/tty +# Test via harness + +test_harness: test_prep + PERL=./perl $(MAKE) TESTFILE=harness _test + # Handy way to run perlbug -ok without having to install and run the # installed perlbug. We don't re-run the tests here - we trust the user. # Please *don't* use this unless all tests pass. |