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
=== modified file 'tests/include.am'
--- tests/include.am 2011-06-09 17:58:33 +0000
+++ tests/include.am 2011-07-28 09:48:35 +0000
@@ -28,33 +28,33 @@
28noinst_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)28noinst_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
29CLEANFILES += $(GENSCRIPTS) tests/mtr29CLEANFILES += $(GENSCRIPTS) tests/mtr
3030
31TEST_RUN= $(PERL) -I../$(top_srcdir)/tests/lib \31TEST_RUN= $(PERL) -I$(top_srcdir)/tests/lib \
32 ../${top_srcdir}/tests/test-run.pl \32 ${top_srcdir}/tests/test-run.pl \
33 --top-srcdir=../${top_srcdir} \33 --top-srcdir=${top_srcdir} \
34 --top-builddir=../${top_builddir} \34 --top-builddir=${top_builddir} \
35 --vardir=../${top_builddir}/tests/var \35 --vardir=${top_builddir}/tests/var \
36 --reorder \36 --reorder \
37 --suitepath=../${top_srcdir}/plugin \37 --suitepath=${top_srcdir}/plugin \
38 --testdir=../${top_srcdir}/tests \38 --testdir=${top_srcdir}/tests \
39 --dtr-build-thread=$$$$39 --dtr-build-thread=$$$$
4040
41TEST_RUN_MEM= $(PERL) -I../$(top_srcdir)/tests/lib \41TEST_RUN_MEM= $(PERL) -I$(top_srcdir)/tests/lib \
42 ../${top_srcdir}/tests/test-run.pl \42 ${top_srcdir}/tests/test-run.pl \
43 --top-srcdir=../${top_srcdir} \43 --top-srcdir=${top_srcdir} \
44 --top-builddir=../${top_builddir} \44 --top-builddir=${top_builddir} \
45 --mem \45 --mem \
46 --reorder \46 --reorder \
47 --suitepath=../${top_srcdir}/plugin \47 --suitepath=${top_srcdir}/plugin \
48 --testdir=../${top_srcdir}/tests \48 --testdir=${top_srcdir}/tests \
49 --dtr-build-thread=$$$$49 --dtr-build-thread=$$$$
5050
51TEST_RUN_DBQP= $(PYTHON) ../$(top_srcdir)/tests/dbqp.py \51TEST_RUN_DBQP= $(PYTHON) $(top_srcdir)/tests/dbqp.py \
52 --top-srcdir=../${top_srcdir} \52 --top-srcdir=${top_srcdir} \
53 --top-builddir=../${top_builddir} \53 --top-builddir=${top_builddir} \
54 --reorder \54 --reorder \
55 --basedir=../${top_srcdir} \55 --basedir=${top_srcdir} \
56 --testdir=../${top_srcdir}/tests \56 --testdir=${top_srcdir}/tests \
57 --workdir=../${top_srcdir}/tests/workdir57 --workdir=${top_srcdir}/tests/workdir
5858
5959
60EXTRA_DIST += \60EXTRA_DIST += \
@@ -112,12 +112,12 @@
112 $(LN_S) dbqp.py tests/dbqp112 $(LN_S) dbqp.py tests/dbqp
113113
114114
115.PHONY: test \115.PHONY: test
116 test-all \116.PHONY: test-all
117 test-big \117.PHONY: test-big
118 test-drizzle \118.PHONY: test-drizzle
119 test-dbqp \119.PHONY: test-dbqp
120 test-plugins120.PHONY: test-plugins
121121
122# Target 'test' will run the regression test suite using the built server.122# Target 'test' will run the regression test suite using the built server.
123#123#
@@ -132,41 +132,43 @@
132# Please keep the list of tests in alphabetical order for ease of132# Please keep the list of tests in alphabetical order for ease of
133# maintenance and verification133# maintenance and verification
134134
135#check_PROGRAMS+= test-all
136
135test-all: 137test-all:
136 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(ALL_TESTS))138 $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(ALL_TESTS)
137139
138test-mem: 140test-mem:
139 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN_MEM) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS))141 $(TEST_RUN_MEM) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS)
140142
141test-drizzle: 143test-drizzle:
142 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS))144 $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS)
143145
144gdb-drizzled: 146gdb-drizzled:
145 ./libtool --mode=execute gdb ./drizzled/drizzled147 ./libtool --mode=execute gdb ./drizzled/drizzled
146148
147test-valgrind: 149test-valgrind:
148 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --valgrind --force --suite=$(NORMAL_TESTS) && python strip-valgrind)150 $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --valgrind --force --suite=$(NORMAL_TESTS) && python strip-valgrind
149151
150test-valgrind-suppressions: 152test-valgrind-suppressions:
151 ( $(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)153 $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --valgrind --valgrind-option='--gen-suppressions=all' --valgrind-option='--show-reachable=yes' --force --suite=$(NORMAL_TESTS) && python strip-valgrind)
152154
153test-junitxml: 155test-junitxml:
154 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS) --subunit | subunit2junitxml --no-passthrough > junit-format.xml )156 $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS) --subunit | subunit2junitxml --no-passthrough > junit-format.xml
155157
156test-big: 158test-big:
157 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=big )159 $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=big
158160
159test-big-junitxml: 161test-big-junitxml:
160 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=big --subunit | subunit2junitxml --no-passthrough > junit-format-big.xml )162 $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=big --subunit | subunit2junitxml --no-passthrough > junit-format-big.xml
161163
162test-jp: 164test-jp:
163 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=jp )165 $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=jp
164166
165test-plugins: 167test-plugins:
166 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(PLUGIN_TESTS) )168 $(TEST_RUN) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(PLUGIN_TESTS)
167169
168test-dbqp: 170test-dbqp:
169 ( $(MAKE) $(AM_MAKEFLAGS) && cd tests && $(TEST_RUN_DBQP) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS) )171 $(TEST_RUN_DBQP) $(TEST_RUN_EXTRA_OPTIONS) --fast --force --suite=$(NORMAL_TESTS)
170172
171173
172distclean-local: nukevar174distclean-local: nukevar
173175
=== modified file 'tests/lib/drizzle_test_run/dtr_test_execution.py'
--- tests/lib/drizzle_test_run/dtr_test_execution.py 2011-06-07 21:19:19 +0000
+++ tests/lib/drizzle_test_run/dtr_test_execution.py 2011-07-28 09:48:35 +0000
@@ -106,6 +106,7 @@
106 drizzletest_output = open(drizzletest_outfile,'w')106 drizzletest_output = open(drizzletest_outfile,'w')
107 drizzletest_subproc = subprocess.Popen( drizzletest_cmd107 drizzletest_subproc = subprocess.Popen( drizzletest_cmd
108 , shell=True108 , shell=True
109 , cwd=self.system_manager.testdir
109 , env=self.working_environment110 , env=self.working_environment
110 , stdout = drizzletest_output111 , stdout = drizzletest_output
111 , stderr = subprocess.STDOUT112 , stderr = subprocess.STDOUT