annotate test/module.mk @ 20360:2d84d27dc9f0

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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
20345
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 TEST_FILES += \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 test/fntests.m \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 test/args.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 test/bug-31371.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 test/bug-38576.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 test/colormaps.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 test/complex.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 test/diag-perm.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 test/error.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 test/eval-catch.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 test/for.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 test/func.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 test/global.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 test/if.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 test/index.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 test/io.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 test/jit.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 test/line-continue.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 test/logical-index.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 test/null-assign.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 test/parser.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 test/prefer.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 test/range.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 test/recursion.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 test/return.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 test/slice.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 test/struct.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 test/switch.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 test/system.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 test/transpose.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 test/try.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 test/unwind.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 test/while.tst
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 DIRSTAMP_FILES += test/$(octave_dirstamp)
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36
20347
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
37 include test/bug-35448/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
38 include test/bug-36025/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
39 include test/bug-38236/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
40 include test/bug-38691/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
41 include test/bug-44940/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
42 include test/class-concat/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
43 include test/classdef/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
44 include test/classes/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
45 include test/ctor-vs-method/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
46 include test/fcn-handle-derived-resolution/module.mk
85b287475196 use nested module.mk include files for test subdirectories
John W. Eaton <jwe@octave.org>
parents: 20346
diff changeset
47 include test/nest/module.mk
20345
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 all-local: test/.gdbinit
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 test/.gdbinit: etc/gdbinit
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 @$(gdbinit_install_rule)
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53
20360
2d84d27dc9f0 eliminate recursive make invocation in src directory
John W. Eaton <jwe@octave.org>
parents: 20359
diff changeset
54 check-local: $(GENERATED_TEST_FILES) $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
20359
79d64c58daea use $(abs_top_srcdir) in rules for running tests
John W. Eaton <jwe@octave.org>
parents: 20347
diff changeset
55 cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test
20345
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57 if AMCOND_HAVE_LLVM
20360
2d84d27dc9f0 eliminate recursive make invocation in src directory
John W. Eaton <jwe@octave.org>
parents: 20359
diff changeset
58 check-jit: $(GENERATED_TEST_FILES) $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
20359
79d64c58daea use $(abs_top_srcdir) in rules for running tests
John W. Eaton <jwe@octave.org>
parents: 20347
diff changeset
59 cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --jit-compiler --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test
20345
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60 endif
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62 test/sparse.tst: test/build-sparse-tests.sh test/$(octave_dirstamp)
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 $(AM_V_GEN)rm -f $@-t $@ && \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64 $(srcdir)/test/build-sparse-tests.sh > $@-t && \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65 mv $@-t $@
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 GENERATED_BC_OVERLOADS_DIRS := \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 $(shell $(srcdir)/test/build-bc-overload-tests.sh test --list-dirs)
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70 GENERATED_BC_OVERLOADS_FILES := \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 $(shell $(srcdir)/test/build-bc-overload-tests.sh test --list-files)
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72
20346
3373f2f760bc fix dependencies for generated overload operator tests
John W. Eaton <jwe@octave.org>
parents: 20345
diff changeset
73 $(GENERATED_BC_OVERLOADS_FILES): test/bc-overload-tests.stamp
3373f2f760bc fix dependencies for generated overload operator tests
John W. Eaton <jwe@octave.org>
parents: 20345
diff changeset
74
20345
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 test/bc-overload-tests.stamp: test/build-bc-overload-tests.sh test/bc-overloads-expected
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 $(AM_V_GEN)rm -f $@ && \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 $(srcdir)/test/build-bc-overload-tests.sh test $(srcdir)/test/bc-overloads-expected && \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 touch $@
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79
20360
2d84d27dc9f0 eliminate recursive make invocation in src directory
John W. Eaton <jwe@octave.org>
parents: 20359
diff changeset
80 GENERATED_TEST_FILES = test/sparse.tst test/bc-overload-tests.stamp
2d84d27dc9f0 eliminate recursive make invocation in src directory
John W. Eaton <jwe@octave.org>
parents: 20359
diff changeset
81
20345
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82 BUILT_SOURCES += \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 test/sparse.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84 test/bc-overload-tests.stamp
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86 EXTRA_DIST += \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
87 test/build-sparse-tests.sh \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
88 test/build-bc-overload-tests.sh \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
89 test/bc-overloads-expected \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
90 test/build_bc_overloads_expected.m \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
91 $(TEST_FILES)
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
92
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
93 CLEANFILES += \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
94 $(GENERATED_BC_OVERLOADS_FILES) \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
95 test/sparse.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
96 test/bc-overload-tests.stamp
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
97
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
98 DISTCLEANFILES += \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
99 test/.gdbinit \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
100 test/fntests.log
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
101
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
102 fixedtestsdir := $(octtestsdir)/fixed
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
103
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
104 nobase_fixedtests_DATA = \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
105 test/sparse.tst \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
106 $(GENERATED_BC_OVERLOADS_FILES) \
c7f9fcff42f2 test/module.mk: New file missing from changeset bacaec9b5535.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
107 $(filter-out test/fntests.m, $(TEST_FILES))