]>
Commit | Line | Data |
---|---|---|
6604389f JB |
1 | --- blcr-0.8.5/tests/Makefile.am.orig 2014-11-28 20:46:49.767484487 +0100 |
2 | +++ blcr-0.8.5/tests/Makefile.am 2014-11-28 21:15:47.662974583 +0100 | |
3 | @@ -43,12 +43,17 @@ | |
4 | if CR_ENABLE_SHARED | |
5 | # These test the actual cr_run utility or dlopen(), and thus require shared libs: | |
6 | SIMPLE_scripts_shared = cr_run cr_targ cr_targ2 cr_omit dlopen | |
7 | +SIMPLE_scripts_shared_sh = cr_run.sh cr_targ.sh cr_targ2.sh cr_omit.sh dlopen.sh | |
8 | endif | |
9 | SIMPLE_progs = atomics bug2524 | |
10 | SIMPLE_scripts = $(SIMPLE_scripts_shared) \ | |
11 | bug2003 run_on save_exe save_priv save_share save_all \ | |
12 | reloc_exe reloc_file reloc_fifo reloc_dir reloc_all \ | |
13 | clobber | |
14 | +SIMPLE_scripts_sh = $(SIMPLE_scripts_shared_sh) \ | |
15 | + bug2003.sh run_on.sh save_exe.sh save_priv.sh save_share.sh save_all.sh \ | |
16 | + reloc_exe.sh reloc_file.sh reloc_fifo.sh reloc_dir.sh reloc_all.sh \ | |
17 | + clobber.sh | |
18 | SIMPLE_TESTS = $(SIMPLE_progs) $(SIMPLE_scripts) | |
19 | ||
20 | # "SEQ" tests are ones that check for certain events happening in | |
21 | @@ -58,9 +63,15 @@ | |
22 | critical_sections replace_cb \ | |
23 | failed_cb failed_cb2 pid_in_use cs_enter_leave cs_enter_leave2 \ | |
24 | cr_tryenter_cs stopped edeadlk pid_restore | |
25 | +SEQ_progs_st = stage0001.st stage0002.st stage0003.st stage0004.st \ | |
26 | + critical_sections.st replace_cb.st \ | |
27 | + failed_cb.st failed_cb2.st pid_in_use.st cs_enter_leave.st cs_enter_leave2.st \ | |
28 | + cr_tryenter_cs.st stopped.st edeadlk.st pid_restore.st | |
29 | # XXX: cb_exit has moved to "bonus" list for now. See bug 2244. | |
30 | # XXX: ptrace has moved to "bonus" list for now. See bug 2455. | |
31 | SEQ_scripts = | |
32 | +SEQ_scripts_sh = | |
33 | +SEQ_scripts_st = | |
34 | SEQ_TESTS = $(SEQ_progs) $(SEQ_scripts) | |
35 | ||
36 | # C/R unit tests ("CRUT") | |
37 | @@ -71,6 +82,11 @@ | |
38 | cloexec get_info orphan overlap child mmaps hugetlbfs readdir dev_null \ | |
39 | cr_signal linked_fifo sigpending dpipe forward hooks math sigaltstack \ | |
40 | prctl lam nscd | |
41 | +CRUT_progs_ct = \ | |
42 | + simple.ct simple_pthread.ct cwd.ct dup.ct filedescriptors.ct pipe.ct named_fifo.ct \ | |
43 | + cloexec.ct get_info.ct orphan.ct overlap.ct child.ct mmaps.ct hugetlbfs.ct readdir.ct dev_null.ct \ | |
44 | + cr_signal.ct linked_fifo.ct sigpending.ct dpipe.ct forward.ct hooks.ct math.ct sigaltstack.ct \ | |
45 | + prctl.ct lam nscd | |
46 | # hugetlbfs2 moved to "bonus" list due to leak of MAP_PRIVATE pages in some kernels | |
47 | CRUT_TESTS = $(CRUT_progs) | |
48 | ||
49 | @@ -83,16 +99,34 @@ | |
50 | guile_test clisp_test rep_test emacslisp_test \ | |
51 | php_test gst_test gcj_test gij_test jre_test \ | |
52 | ocaml_test sml_test mosml_test | |
53 | +SEQ_scripts2_shared_sh = \ | |
54 | + ash_test.sh bash_test.sh csh_test.sh ksh_test.sh zsh_test.sh \ | |
55 | + perl_test.sh python_test.sh tcl_test.sh expect_test.sh ruby_test.sh \ | |
56 | + guile_test.sh clisp_test.sh rep_test.sh emacslisp_test.sh \ | |
57 | + php_test.sh gst_test.sh gcj_test.sh gij_test.sh jre_test.sh \ | |
58 | + ocaml_test.sh sml_test.sh mosml_test.sh | |
59 | +SEQ_scripts2_shared_st = \ | |
60 | + ash_test.st bash_test.st csh_test.st ksh_test.st zsh_test.st \ | |
61 | + perl_test.st python_test.st tcl_test.st expect_test.st ruby_test.st \ | |
62 | + guile_test.st clisp_test.st rep_test.st emacslisp_test.st \ | |
63 | + php_test.st gst_test.st gcj_test.st gij_test.st jre_test.st \ | |
64 | + ocaml_test.st sml_test.st mosml_test.st | |
65 | endif | |
66 | if CR_HAVE_CXX | |
67 | SEQ_testcxx = testcxx | |
68 | +SEQ_testcxx_st = testcxx.st | |
69 | testcxx_SOURCES = testcxx.cc | |
70 | endif | |
71 | SIMPLE_progs2 = atomics_stress | |
72 | SIMPLE_scripts2 = | |
73 | +SIMPLE_scripts2_sh = | |
74 | SEQ_progs2 = cb_exit ptrace $(SEQ_testcxx) | |
75 | +SEQ_progs2_st = cb_exit.st ptrace.st $(SEQ_testcxx_st) | |
76 | SEQ_scripts2 = $(SEQ_scripts2_shared) | |
77 | +SEQ_scripts2_sh = $(SEQ_scripts2_shared_sh) | |
78 | +SEQ_scripts2_st = $(SEQ_scripts2_shared_st) | |
79 | CRUT_progs2 = hugetlbfs2 | |
80 | +CRUT_progs2_ct = hugetlbfs2.ct | |
81 | SIMPLE_TESTS2 = $(SIMPLE_progs2) $(SIMPLE_scripts2) | |
82 | SEQ_TESTS2 = $(SEQ_progs2) $(SEQ_scripts2) | |
83 | CRUT_TESTS2 = $(CRUT_progs2) | |
84 | @@ -146,14 +180,15 @@ | |
85 | # The .sh suffix not meant denote any specific shell | |
86 | all_scripts = $(SIMPLE_scripts) $(SEQ_scripts) $(helper_scripts) \ | |
87 | $(SIMPLE_scripts2) $(SEQ_scripts2) $(helper_scripts2) | |
88 | -all_scripts_src = $(patsubst %,%.sh,$(all_scripts)) | |
89 | +all_scripts_src = $(SIMPLE_scripts_sh) $(SEQ_scripts_sh) $(helper_scripts_sh) \ | |
90 | + $(SIMPLE_scripts2_sh) $(SEQ_scripts2_sh) $(helper_scripts2_sh) | |
91 | $(all_scripts): shellinit | |
92 | $(all_scripts) : % : %.sh | |
93 | $(INSTALL_SCRIPT) $< $@ | |
94 | ||
95 | # Rule to wrap the SEQ tests with the seq_wrapper | |
96 | -SEQ_RUN = $(patsubst %,%.st,$(SEQ_TESTS)) | |
97 | -SEQ_RUN2 = $(patsubst %,%.st,$(SEQ_TESTS2)) | |
98 | +SEQ_RUN = $(SEQ_progs_st) $(SEQ_scripts_st) | |
99 | +SEQ_RUN2 = $(SEQ_progs2_st) $(SEQ_scripts2_st) | |
100 | $(SEQ_RUN) $(SEQ_RUN2) : %.st : % seq_wrapper | |
101 | @rm -f $@ | |
102 | @$(LN_S) -f seq_wrapper $@ | |
103 | @@ -161,8 +196,8 @@ | |
104 | # Rule to wrap the CRUT tests with the crut_wrapper | |
105 | # We use a 1-line script, not a symlink, in the build directory | |
106 | # to allow crut_wrapper to be a libtool wrapper itself. | |
107 | -CRUT_RUN = $(patsubst %,%.ct,$(CRUT_TESTS)) | |
108 | -CRUT_RUN2 = $(patsubst %,%.ct,$(CRUT_TESTS2)) | |
109 | +CRUT_RUN = $(CRUT_progs_ct) | |
110 | +CRUT_RUN2 = $(CRUT_progs2_ct) | |
111 | $(CRUT_RUN) $(CRUT_RUN2) : %.ct : % crut_wrapper | |
112 | @rm -f $@ | |
113 | @(echo '#!/bin/sh'; \ | |
114 | @@ -210,7 +245,9 @@ | |
115 | helper_progs = $(helper_progs_shared) bug2003_aux pause save_aux reloc_aux | |
116 | helper_progs2 = | |
117 | helper_scripts = | |
118 | +helper_scripts_sh = | |
119 | helper_scripts2 = | |
120 | +helper_scripts2_sh = | |
121 | ||
122 | # Maintainer-only tests | |
123 | BONUS_TESTS = $(SIMPLE_TESTS2) $(SEQ_RUN2) $(CRUT_RUN2) |