Drizzle

Merge lp:~brianaker/drizzle/cd-test-cleanup into lp:~drizzle-trunk/drizzle/development

  1. cd-test-cleanup
  2. Merge into development
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: 2374
Merged at revision: 2374
Proposed branch: lp:~brianaker/drizzle/cd-test-cleanup
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 142 lines (+39/-36)
2 files modified
tests/include.am (+38/-36)
tests/lib/drizzle_test_run/dtr_test_execution.py (+1/-0)
To merge this branch: bzr merge lp:~brianaker/drizzle/cd-test-cleanup
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+69610@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/include.am'
2--- tests/include.am 2011-06-09 17:58:33 +0000
3+++ tests/include.am 2011-07-28 09:48:35 +0000
4@@ -28,33 +28,33 @@
5 noinst_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
6 CLEANFILES += $(GENSCRIPTS) tests/mtr
7
8-TEST_RUN= $(PERL) -I../$(top_srcdir)/tests/lib \
9- ../${top_srcdir}/tests/test-run.pl \
10- --top-srcdir=../${top_srcdir} \
11- --top-builddir=../${top_builddir} \
12- --vardir=../${top_builddir}/tests/var \
13+TEST_RUN= $(PERL) -I$(top_srcdir)/tests/lib \
14+ ${top_srcdir}/tests/test-run.pl \
15+ --top-srcdir=${top_srcdir} \
16+ --top-builddir=${top_builddir} \
17+ --vardir=${top_builddir}/tests/var \
18 --reorder \
19- --suitepath=../${top_srcdir}/plugin \
20- --testdir=../${top_srcdir}/tests \
21+ --suitepath=${top_srcdir}/plugin \
22+ --testdir=${top_srcdir}/tests \
23 --dtr-build-thread=$$$$
24
25-TEST_RUN_MEM= $(PERL) -I../$(top_srcdir)/tests/lib \
26- ../${top_srcdir}/tests/test-run.pl \
27- --top-srcdir=../${top_srcdir} \
28- --top-builddir=../${top_builddir} \
29+TEST_RUN_MEM= $(PERL) -I$(top_srcdir)/tests/lib \
30+ ${top_srcdir}/tests/test-run.pl \
31+ --top-srcdir=${top_srcdir} \
32+ --top-builddir=${top_builddir} \
33 --mem \
34 --reorder \
35- --suitepath=../${top_srcdir}/plugin \
36- --testdir=../${top_srcdir}/tests \
37+ --suitepath=${top_srcdir}/plugin \
38+ --testdir=${top_srcdir}/tests \
39 --dtr-build-thread=$$$$
40
41-TEST_RUN_DBQP= $(PYTHON) ../$(top_srcdir)/tests/dbqp.py \
42- --top-srcdir=../${top_srcdir} \
43- --top-builddir=../${top_builddir} \
44+TEST_RUN_DBQP= $(PYTHON) $(top_srcdir)/tests/dbqp.py \
45+ --top-srcdir=${top_srcdir} \
46+ --top-builddir=${top_builddir} \
47 --reorder \
48- --basedir=../${top_srcdir} \
49- --testdir=../${top_srcdir}/tests \
50- --workdir=../${top_srcdir}/tests/workdir
51+ --basedir=${top_srcdir} \
52+ --testdir=${top_srcdir}/tests \
53+ --workdir=${top_srcdir}/tests/workdir
54
55
56 EXTRA_DIST += \
57@@ -112,12 +112,12 @@
58 $(LN_S) dbqp.py tests/dbqp
59
60
61-.PHONY: test \
62- test-all \
63- test-big \
64- test-drizzle \
65- test-dbqp \
66- test-plugins
67+.PHONY: test
68+.PHONY: test-all
69+.PHONY: test-big
70+.PHONY: test-drizzle
71+.PHONY: test-dbqp
72+.PHONY: test-plugins
73
74 # Target 'test' will run the regression test suite using the built server.
75 #
76@@ -132,41 +132,43 @@
77 # Please keep the list of tests in alphabetical order for ease of
78 # maintenance and verification
79
80+#check_PROGRAMS+= test-all
81+
82 test-all:
83- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(ALL_TESTS))
84+ $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(ALL_TESTS)
85
86 test-mem:
87- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN_MEM) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS))
88+ $(TEST_RUN_MEM) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS)
89
90 test-drizzle:
91- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS))
92+ $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS)
93
94 gdb-drizzled:
95 ./libtool --mode=execute gdb ./drizzled/drizzled
96
97 test-valgrind:
98- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --valgrind --force --suite=$(NORMAL_TESTS) && python strip-valgrind)
99+ $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --valgrind --force --suite=$(NORMAL_TESTS) && python strip-valgrind
100
101 test-valgrind-suppressions:
102- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --valgrind --valgrind-option='--gen-suppressions=all' --valgrind-option='--show-reachable=yes' --force --suite=$(NORMAL_TESTS) && python strip-valgrind)
103+ $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --valgrind --valgrind-option='--gen-suppressions=all' --valgrind-option='--show-reachable=yes' --force --suite=$(NORMAL_TESTS) && python strip-valgrind)
104
105 test-junitxml:
106- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS) --subunit | subunit2junitxml --no-passthrough > junit-format.xml )
107+ $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS) --subunit | subunit2junitxml --no-passthrough > junit-format.xml
108
109 test-big:
110- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=big )
111+ $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=big
112
113 test-big-junitxml:
114- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=big --subunit | subunit2junitxml --no-passthrough > junit-format-big.xml )
115+ $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=big --subunit | subunit2junitxml --no-passthrough > junit-format-big.xml
116
117 test-jp:
118- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=jp )
119+ $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=jp
120
121 test-plugins:
122- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(PLUGIN_TESTS) )
123+ $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(PLUGIN_TESTS)
124
125 test-dbqp:
126- ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN_DBQP) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS) )
127+ $(TEST_RUN_DBQP) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS)
128
129
130 distclean-local: nukevar
131
132=== modified file 'tests/lib/drizzle_test_run/dtr_test_execution.py'
133--- tests/lib/drizzle_test_run/dtr_test_execution.py 2011-06-07 21:19:19 +0000
134+++ tests/lib/drizzle_test_run/dtr_test_execution.py 2011-07-28 09:48:35 +0000
135@@ -106,6 +106,7 @@
136 drizzletest_output = open(drizzletest_outfile,'w')
137 drizzletest_subproc = subprocess.Popen( drizzletest_cmd
138 , shell=True
139+ , cwd=self.system_manager.testdir
140 , env=self.working_environment
141 , stdout = drizzletest_output
142 , stderr = subprocess.STDOUT