15 files changed, 28 insertions, 21 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
index c3017adccc..7d89777eff 100644
--- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
@@ -25,8 +25,7 @@ EXTRA_DIST = 			\
 	run_tests.in		\
 	test_16bit_1chunk.wav
 
-TESTS = 			\
-	run_tests
+TESTS = run_tests
 
 
 grgrpythondir = $(grpythondir)/gr
diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am
index 37b60e6a4e..98aead0faf 100644
--- a/gr-atsc/src/python/Makefile.am
+++ b/gr-atsc/src/python/Makefile.am
@@ -36,8 +36,7 @@ dist_ourdata_SCRIPTS =  \
 	xlate.py	\
 	viterbi-out.py
 
-TESTS = 				\
-	run_tests
+TESTS = run_tests
 
 noinst_PYTHON = 			\
 	atsc_utils.py			\
diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index f06f445a57..f7f65a7444 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -21,6 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
 EXTRA_DIST = run_tests.in
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
@@ -52,7 +53,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 if PYTHON
 ###################################
 # SWIG Python interface and library
-TESTS = run_tests
+TESTS += run_tests
 DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES = 			\
diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index 628c9fd930..acb29b9fd0 100644
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/src/Makefile.am
@@ -21,6 +21,8 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
+
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 EXTRA_DIST = run_tests.in
@@ -47,7 +49,7 @@ libgnuradio_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 if PYTHON
 ###################################
 # SWIG Python interface and library
-TESTS = run_tests
+TESTS += run_tests
 DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES =		\
diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am
index ee9df77659..253a041d43 100644
--- a/gr-audio-osx/src/Makefile.am
+++ b/gr-audio-osx/src/Makefile.am
@@ -21,6 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
 EXTRA_DIST = run_tests.in
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
@@ -57,7 +58,7 @@ libgnuradio_audio_osx_la_LDFLAGS =	\
 if PYTHON
 ###################################
 # SWIG Python interface and library
-TESTS = run_tests
+TESTS += run_tests
 DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES =			\
diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am
index 4fa098dcc4..2bf4010609 100644
--- a/gr-audio-portaudio/src/Makefile.am
+++ b/gr-audio-portaudio/src/Makefile.am
@@ -21,6 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
 EXTRA_DIST = run_tests.in
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
@@ -54,7 +55,7 @@ libgnuradio_audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 if PYTHON
 ###################################
 # SWIG Python interface and library
-TESTS = run_tests
+TESTS += run_tests
 DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES = 			\
diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am
index d158b6d8c7..97dc49f5a5 100644
--- a/gr-audio-windows/src/Makefile.am
+++ b/gr-audio-windows/src/Makefile.am
@@ -21,6 +21,8 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
+
 EXTRA_DIST = run_tests.in
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
@@ -50,7 +52,7 @@ libgnuradio_audio_windows_la_LDFLAGS =	\
 if PYTHON
 ###################################
 # SWIG Python interface and library
-TESTS = run_tests
+TESTS += run_tests
 DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES = 			\
diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am
index a55bd175b9..dd759d8a06 100644
--- a/gr-comedi/src/Makefile.am
+++ b/gr-comedi/src/Makefile.am
@@ -21,6 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
 EXTRA_DIST = run_tests.in
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
@@ -52,7 +53,7 @@ libgnuradio_comedi_la_LDFLAGS =	$(NO_UNDEFINED) $(LTVERSIONFLAGS)
 if PYTHON
 ###################################
 # SWIG Python interface and library
-TESTS = run_tests
+TESTS += run_tests
 DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES =		\
diff --git a/gr-cvsd-vocoder/src/python/Makefile.am b/gr-cvsd-vocoder/src/python/Makefile.am
index 801dc8fbb3..2ba3abef87 100644
--- a/gr-cvsd-vocoder/src/python/Makefile.am
+++ b/gr-cvsd-vocoder/src/python/Makefile.am
@@ -24,8 +24,7 @@ include $(top_srcdir)/Makefile.common
 EXTRA_DIST = run_tests.in
 
 
-TESTS = 				\
-	run_tests
+TESTS = run_tests
 
 
 grblkspythondir = $(grpythondir)/blks2impl
diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am
index 60ec6cc731..3c3ee69734 100644
--- a/gr-gcell/src/Makefile.am
+++ b/gr-gcell/src/Makefile.am
@@ -20,6 +20,8 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
+
 SUBDIRS = . examples
 
 AM_CPPFLAGS = $(GCELL_INCLUDES) $(STD_DEFINES_AND_INCLUDES) \
@@ -59,7 +61,7 @@ if PYTHON
 #                         SWIG stuff
 # ----------------------------------------------------------------
 EXTRA_DIST = run_tests.in
-TESTS = run_tests
+TESTS += run_tests
 
 TOP_SWIG_IFILES =		\
 	gcell.i
diff --git a/gr-gsm-fr-vocoder/src/python/Makefile.am b/gr-gsm-fr-vocoder/src/python/Makefile.am
index f6fba24b61..c6c326b443 100644
--- a/gr-gsm-fr-vocoder/src/python/Makefile.am
+++ b/gr-gsm-fr-vocoder/src/python/Makefile.am
@@ -24,8 +24,7 @@ include $(top_srcdir)/Makefile.common
 EXTRA_DIST = run_tests.in
 
 
-TESTS = 				\
-	run_tests
+TESTS = run_tests
 
 
 noinst_PYTHON = 			\
diff --git a/gr-radio-astronomy/src/python/Makefile.am b/gr-radio-astronomy/src/python/Makefile.am
index e8a84de61f..e342651ae7 100644
--- a/gr-radio-astronomy/src/python/Makefile.am
+++ b/gr-radio-astronomy/src/python/Makefile.am
@@ -35,8 +35,7 @@ wxguilibdir     = $(grpyexecdir)/wxgui
 EXTRA_DIST =				\
 	run_tests.in
 
-TESTS = 				\
-	run_tests
+TESTS = run_tests
 
 
 noinst_PYTHON = 			\
diff --git a/gr-trellis/src/python/Makefile.am b/gr-trellis/src/python/Makefile.am
index 76ec9d0c17..2b93300de5 100644
--- a/gr-trellis/src/python/Makefile.am
+++ b/gr-trellis/src/python/Makefile.am
@@ -25,8 +25,7 @@ EXTRA_DIST = run_tests.in		\
 	awgn1o2_4.fsm
 
 
-TESTS = 				\
-	run_tests
+TESTS = run_tests
 
 
 noinst_PYTHON = 			\
diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index 0d55d73ba6..8b94ae54f6 100644
--- a/gr-usrp2/src/Makefile.am
+++ b/gr-usrp2/src/Makefile.am
@@ -21,6 +21,8 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
+
 # ----------------------------------------------------------------------
 # Local Python files, not installed
 #
@@ -87,7 +89,7 @@ if PYTHON
 # usrp2.py
 # _usrp2.so
 # ----------------------------------------------------------------------
-TESTS = run_tests
+TESTS += run_tests
 
 TOP_SWIG_IFILES =		\
 	usrp2.i
diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 45cedfb212..a3e9a56121 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -21,6 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
 EXTRA_DIST = run_tests.in
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
@@ -48,7 +49,7 @@ libgnuradio_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 if PYTHON
 #################################
 # SWIG interface and library
-TESTS = run_tests
+TESTS += run_tests
 DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES =			\