Mercurial > jwe > octave
changeset 30819:1385d0c8fa8c
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 03 Mar 2022 16:16:52 -0500 |
| parents | 0e88072e8265 (current diff) c3d7c1ede44c (diff) |
| children | 3ee2fba50b72 |
| files | |
| diffstat | 1 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/test/Makefile.am Thu Mar 03 22:05:33 2022 +0100 +++ b/test/Makefile.am Thu Mar 03 16:16:52 2022 -0500 @@ -7,6 +7,14 @@ TEST_FILES = noinst_TEST_FILES = +octave_dirstamp = $(am__leading_dot)octave-dirstamp + +DIRSTAMP_FILES += $(octave_dirstamp) + +$(DIRSTAMP_FILES): + $(AM_V_GEN)$(MKDIR_P) $(@D) && \ + : > $@ + TEST_FILES += \ fntests.m \ args.tst \ @@ -60,8 +68,6 @@ unwind.tst \ while.tst -DIRSTAMP_FILES += $(octave_dirstamp) - include bug-35448/module.mk include bug-35881/module.mk include bug-36025/module.mk @@ -169,16 +175,16 @@ mv $@-t $@ GENERATED_BC_OVERLOADS_DIRS := \ - $(shell $(SHELL) $(srcdir)/mk-bc-overloads-tst.sh test --list-dirs) + $(shell $(SHELL) $(srcdir)/mk-bc-overloads-tst.sh $(abs_top_builddir)/test --list-dirs) GENERATED_BC_OVERLOADS_FILES := \ - $(shell $(SHELL) $(srcdir)/mk-bc-overloads-tst.sh test --list-files) + $(shell $(SHELL) $(srcdir)/mk-bc-overloads-tst.sh $(abs_top_builddir)/test --list-files) $(GENERATED_BC_OVERLOADS_FILES): mk-bc-overloads-tst-stamp .bc-overload-tests-stamp: mk-bc-overloads-tst.sh bc-overloads-expected | $(octave_dirstamp) $(AM_V_GEN)rm -f $@ && \ - $(SHELL) $(srcdir)/mk-bc-overloads-tst.sh test $(srcdir)/bc-overloads-expected && \ + $(SHELL) $(srcdir)/mk-bc-overloads-tst.sh $(abs_top_builddir)/test $(srcdir)/bc-overloads-expected && \ touch $@ GENERATED_TEST_FILES = \