BugID: 824

Moved definition of TESTS_ENVIROMENT variable from the Makefile.am files to
the Makefile.common file.

Appl/CEP/CS1/CS1_BBS/test/Makefile.am

@@ -20,10 +20,6 @@ EXTRA_DIST            = $(TESTSCRIPTS) CS1_BBS.parset
 #testprg_LDADD                  = ../src/libcs1_inputsection.la
 #testprg_DEPENDENCIES           = ../src/libcs1_inputsection.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT               = lofar_sharedir=$(lofar_sharedir) \
-                                  srcdir=$(srcdir) \
-                                  LOFARROOT=$(LOFARROOT) \
-                                  LOFARDATAROOT=$(LOFARDATAROOT)
 
 
 include $(top_srcdir)/Makefile.common

Appl/CEP/CS1/CS1_BGLProc/test/Makefile.am

@@ -25,8 +25,5 @@ CCASFLAGS		= $(patsubst -q%,,$(CPPFLAGS)) $(EXTRA_CPPFLAGS)
 TESTS   = 					\
 tWH_BGL_Processing.sh
 
-TESTS_ENVIRONMENT		= top_srcdir=$(top_srcdir) \
-				  lofar_sharedir=$(lofar_sharedir) \
-				  common_top_builddir=$(common_top_builddir)
 
 include $(top_srcdir)/Makefile.common

Appl/CEP/CS1/CS1_DelayCompensation/test/Makefile.am

@@ -16,10 +16,5 @@ tWH_DelayCompensation_DEPENDENCIES = ../src/libcs1_delaycompensation.la $(LOFAR_
 # all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
 EXTRA_DIST		= $(TESTS)
 
-TESTS_ENVIRONMENT	= lofar_sharedir=$(lofar_sharedir) \
-			  srcdir=$(srcdir) \
-			  LOFARROOT=$(LOFARROOT) \
-			  LOFARDATAROOT=$(LOFARDATAROOT) \
-			  MPIBIN=$(MPIBIN)
 
 include $(top_srcdir)/Makefile.common

Appl/CEP/CS1/CS1_Flagger/test/Makefile.am

@@ -20,10 +20,6 @@ EXTRA_DIST            = $(TESTSCRIPTS) CS1_Flagger.parset
 #testprg_LDADD                  = ../src/libcs1_inputsection.la
 #testprg_DEPENDENCIES           = ../src/libcs1_inputsection.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT               = lofar_sharedir=$(lofar_sharedir) \
-                                  srcdir=$(srcdir) \
-                                  LOFARROOT=$(LOFARROOT) \
-                                  LOFARDATAROOT=$(LOFARDATAROOT)
 
 
 include $(top_srcdir)/Makefile.common

Appl/CEP/CS1/CS1_Generator/test/Makefile.am

@@ -20,11 +20,6 @@ EXTRA_DIST            = $(TESTSCRIPTS)
 #testprg_LDADD			= ../src/libcs1_generator.la
 #testprg_DEPENDENCIES		= ../src/libcs1_generator.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  srcdir=$(srcdir) \
-				  LOFARROOT=$(LOFARROOT) \
-				  LOFARDATAROOT=$(LOFARDATAROOT) \
-				  MPIBIN=$(MPIBIN)
 
 
 include $(top_srcdir)/Makefile.common

Appl/CEP/CS1/CS1_Imager/test/Makefile.am

@@ -20,10 +20,6 @@ EXTRA_DIST            = $(TESTSCRIPTS) CS1_Imager.parset
 #testprg_LDADD                  = ../src/libcs1_inputsection.la
 #testprg_DEPENDENCIES           = ../src/libcs1_inputsection.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT               = lofar_sharedir=$(lofar_sharedir) \
-                                  srcdir=$(srcdir) \
-                                  LOFARROOT=$(LOFARROOT) \
-                                  LOFARDATAROOT=$(LOFARDATAROOT)
 
 
 include $(top_srcdir)/Makefile.common

Appl/CEP/CS1/CS1_InputSection/test/Makefile.am

@@ -20,11 +20,6 @@ EXTRA_DIST            = $(TESTSCRIPTS)
 #testprg_LDADD			= ../src/libcs1_inputsection.la
 #testprg_DEPENDENCIES		= ../src/libcs1_inputsection.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  srcdir=$(srcdir) \
-				  LOFARROOT=$(LOFARROOT) \
-				  LOFARDATAROOT=$(LOFARDATAROOT) \
-				  MPIBIN=$(MPIBIN)
 
 
 include $(top_srcdir)/Makefile.common

Appl/CEP/CS1/CS1_Interface/test/Makefile.am

@@ -25,11 +25,6 @@ tSparseSet_DEPENDENCIES = ../src/libcs1_interface.la
 #testprg_LDADD			= ../src/libcs1_interface.la
 #testprg_DEPENDENCIES		= ../src/libcs1_interface.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  srcdir=$(srcdir) \
-				  LOFARROOT=$(LOFARROOT) \
-				  LOFARDATAROOT=$(LOFARDATAROOT) \
-				  MPIBIN=$(MPIBIN)
 
 
 include $(top_srcdir)/Makefile.common

Appl/CEP/CS1/CS1_Storage/test/Makefile.am

@@ -20,11 +20,6 @@ tAH_TestStorage_SOURCES		= tAH_TestStorage.cc \
 tAH_TestStorage_LDADD		= ../src/libcs1_storage.la
 tAH_TestStorage_DEPENDENCIES	= ../src/libcs1_storage.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  srcdir=$(srcdir) \
-				  LOFARROOT=$(LOFARROOT) \
-				  LOFARDATAROOT=$(LOFARDATAROOT) \
-				  MPIBIN=$(MPIBIN)
 
 
 include $(top_srcdir)/Makefile.common

CEP/BB/BBS/test/Makefile.am

@@ -46,11 +46,6 @@ tDFT_DEPENDENCIES = ../src/libbbs.la $(LOFAR_DEPEND)
 
 LDADD				= ../src/libbbs.la 
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  prefix=$(prefix) \
-				  srcdir=${srcdir} \
-				  MPIBIN=$(MPIBIN) \
-				  AIPSPP=$(AIPSPP)
 
 TESTS = tFillRow.sh tMeqPolc.sh tMeqPolcLog.sh tMeqTabular.sh tMeqParm.sh \
 tParmMerge.sh tMSData.sh tPredict.sh tPerturbed.sh tSubtract.sh tCorrect.sh \

CEP/BB/BBS3/test/Makefile.am

@@ -33,9 +33,6 @@ tShift_DEPENDENCIES = ../src/libbbs3.la $(LOFAR_DEPEND)
 
 LDADD				= ../src/libbbs3.la 
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  MPIBIN=$(MPIBIN) \
-				  AIPSPP=$(AIPSPP)
 
 TESTS = tMeqPolc.sh tMeqParm.sh tPredSolv.sh tPredict.sh tSubtract.sh tCorrect.sh tPerturbed.sh tMSData.sh
 

CEP/BB/BBSControl/test/Makefile.am

@@ -21,8 +21,6 @@ EXTRA_tDH_BBSStep_DIST		= tDH_BBSStep.run
 
 TESTS				= $(check_SCRIPTS)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  LOFARROOT=$(LOFARROOT)
 
 EXTRA_DIST			= $(check_SCRIPTS) \
 				  $(EXTRA_tBBSStrategy_DIST) \

CEP/BB/BBSKernel/test/Makefile.am

@@ -46,11 +46,6 @@ tDFT_DEPENDENCIES = ../src/libbbs.la $(LOFAR_DEPEND)
 
 LDADD				= ../src/libbbs.la 
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  prefix=$(prefix) \
-				  srcdir=${srcdir} \
-				  MPIBIN=$(MPIBIN) \
-				  AIPSPP=$(AIPSPP)
 
 TESTS = tFillRow.sh tMeqPolc.sh tMeqPolcLog.sh tMeqTabular.sh tMeqParm.sh \
 tParmMerge.sh tMSData.sh tPredict.sh tPerturbed.sh tSubtract.sh tCorrect.sh \

CEP/BB/BDBReplication/test/Makefile.am

@@ -7,7 +7,6 @@ tBDBReplication_SOURCES  	= tBDBReplication.cc
 LDADD = ../src/libbdbreplication.la
 DEPENDENCIES = ../src/libbdbreplication.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT               = lofar_sharedir=$(lofar_sharedir)
 
 TESTS   =                                       \
         tBDBReplication.sh

CEP/BB/MS/test/Makefile.am

@@ -8,7 +8,6 @@ TESTS	= tMSSplit_test.sh
 tMSSplit_SOURCES		= tMSSplit.cc
 tMSSplit_DEPENDENCIES		= $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir)
 
 
 include $(top_srcdir)/Makefile.common

CEP/BB/ParmDB/test/Makefile.am

@@ -20,11 +20,6 @@ EXTRA_DIST            = $(TESTSCRIPTS)
 #testprg_LDADD			= ../src/libparmtable.la
 #testprg_DEPENDENCIES		= ../src/libparmtable.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  srcdir=$(srcdir) \
-				  LOFARROOT=$(LOFARROOT) \
-				  LOFARDATAROOT=$(LOFARDATAROOT) \
-				  MPIBIN=$(MPIBIN)
 
 
 include $(top_srcdir)/Makefile.common

CEP/BB/ParmFacade/test/Makefile.am

@@ -20,11 +20,6 @@ tParmFacade_SOURCES		= tParmFacade.cc
 tParmFacade_LDADD		= ../src/libparmfacade.la
 tParmFacade_DEPENDENCIES	= ../src/libparmfacade.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  srcdir=$(srcdir) \
-				  LOFARROOT=$(LOFARROOT) \
-				  LOFARDATAROOT=$(LOFARDATAROOT) \
-				  MPIBIN=$(MPIBIN)
 
 
 include $(top_srcdir)/Makefile.common

CEP/CEPFrame/test/Makefile.am

@@ -29,9 +29,6 @@ CyclicBufferTest_SOURCES	= CyclicBufferTest.cc
 LDADD				= ../src/libcepframe.la
 DEPENDENCIES			= ../src/libcepframe.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  top_srcdir=$(top_srcdir) \
-				  MPIBIN=$(MPIBIN)
 
 TESTS	=					\
 	Example_test.sh				\

CEP/Tools/Generator/test/Makefile.am

@@ -20,11 +20,6 @@ EXTRA_DIST            = $(TESTSCRIPTS)
 #testprg_LDADD			= ../src/libgenerator.la
 #testprg_DEPENDENCIES		= ../src/libgenerator.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT		= lofar_sharedir=$(lofar_sharedir) \
-				  srcdir=$(srcdir) \
-				  LOFARROOT=$(LOFARROOT) \
-				  LOFARDATAROOT=$(LOFARDATAROOT) \
-				  MPIBIN=$(MPIBIN)
 
 
 include $(top_srcdir)/Makefile.common

CEP/Tools/PerfTest/AsyncTest/test/Makefile.am

@@ -4,8 +4,6 @@ TestAsynchronous_SOURCES  	= TestAsynchronous.cc
 TestAsynchronous_LDADD	  	= ../src/libAsyncTest.la 
 TestAsynchronous_DEPENDENCIES	= ../src/libAsyncTest.la $(LOFAR_DEPEND)
 
-TESTS_ENVIRONMENT	  = lofar_sharedir=$(lofar_sharedir) \
-					   MPIBIN=$(MPIBIN)
 
 TESTS	=				\
 	Asynchronous_test.sh