Mercurial > octave-nkf

comparison test/module.mk @ 20360:2d84d27dc9f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate recursive make invocation in src directory * src/module.mk: New file, created from src/Makefile.am. * src/Makefile.am: Delete. * configure.ac (AC_OUTPUT): Don't generate src/Makefile. * Makefile.am (SUBDIRS): Remove src. (ALL_LOCAL_TARGETS, bin_PROGRAMS, noinst_HEADERS, OCTAVE_VERSION_LINKS, OCTAVE_CROSS_TOOLS, archlib_PROGRAMS, OCTAVE_INTERPRETER_TARGETS): Initialize new variables. * doc/module.mk ($(GRAPH_PROP_TEXI_SRC), $(BUILT_IMAGES), doc/interpreter/doc-cache): Depend on $(OCTAVE_INTERPRETER_TARGETS). Fix dependencies for octave.html. Use $(abs_top_srcdir) instead of $(srcdir) in rules that use cd. * test/module.mk (GENERATED_TEST_FILES): New macro. (check-local, check-jit): Depend on $(OCTAVE_INTERPRETER_TARGETS) and $(GENERATED_TEST_FILES).
author John W. Eaton <jwe@octave.org>
date Thu, 09 Jul 2015 10:11:41 -0400
parents 79d64c58daea
children d54f3d6c8741
comparison
equal deleted inserted replaced
20359:79d64c58daea 20360:2d84d27dc9f0
49 all-local: test/.gdbinit 49 all-local: test/.gdbinit
50 50
51 test/.gdbinit: etc/gdbinit 51 test/.gdbinit: etc/gdbinit
52 @$(gdbinit_install_rule) 52 @$(gdbinit_install_rule)
53 53
54 check-local: 54 check-local: $(GENERATED_TEST_FILES) $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
55 cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test 55 cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test
56 56
57 if AMCOND_HAVE_LLVM 57 if AMCOND_HAVE_LLVM
58 check-jit: test/sparse.tst test/bc-overload-tests.stamp test/$(octave_dirstamp) 58 check-jit: $(GENERATED_TEST_FILES) $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
59 cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --jit-compiler --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test 59 cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --jit-compiler --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test
60 endif 60 endif
61 61
62 test/sparse.tst: test/build-sparse-tests.sh test/$(octave_dirstamp) 62 test/sparse.tst: test/build-sparse-tests.sh test/$(octave_dirstamp)
63 $(AM_V_GEN)rm -f $@-t $@ && \ 63 $(AM_V_GEN)rm -f $@-t $@ && \
74 74
75 test/bc-overload-tests.stamp: test/build-bc-overload-tests.sh test/bc-overloads-expected 75 test/bc-overload-tests.stamp: test/build-bc-overload-tests.sh test/bc-overloads-expected
76 $(AM_V_GEN)rm -f $@ && \ 76 $(AM_V_GEN)rm -f $@ && \
77 $(srcdir)/test/build-bc-overload-tests.sh test $(srcdir)/test/bc-overloads-expected && \ 77 $(srcdir)/test/build-bc-overload-tests.sh test $(srcdir)/test/bc-overloads-expected && \
78 touch $@ 78 touch $@
79
80 GENERATED_TEST_FILES = test/sparse.tst test/bc-overload-tests.stamp
79 81
80 BUILT_SOURCES += \ 82 BUILT_SOURCES += \
81 test/sparse.tst \ 83 test/sparse.tst \
82 test/bc-overload-tests.stamp 84 test/bc-overload-tests.stamp
83 85