Rename DATADIR to TEST_DATA_DIR in test programs

Original: 56947486db476bb317dddd2b48a0f16277d2bf70

lal/lib/lalsupport/test/ConfigFileTest.c

@@ -41,7 +41,7 @@ int main ( int argc, char *argv[])
   BOOLEAN wasRead = 0;
 
   // ---------- TEST 1: make sure the XLAL methods can read config files without sections ----------
-  const char *cfgname = DATADIR "ConfigFileSample.cfg";
+  const char *cfgname = TEST_DATA_DIR "ConfigFileSample.cfg";
 
   XLAL_CHECK ( XLALParseDataFile ( &cfgdata, cfgname ) == XLAL_SUCCESS, XLAL_EFUNC, "Failed to parse config-file '%s'", cfgname );
 
@@ -90,7 +90,7 @@ int main ( int argc, char *argv[])
 
   // ---------- TEST 2: read some values from different sections ----------
 
-  cfgname = DATADIR "ConfigFileSample2.cfg";
+  cfgname = TEST_DATA_DIR "ConfigFileSample2.cfg";
   XLAL_CHECK ( XLALParseDataFile ( &cfgdata, cfgname ) == XLAL_SUCCESS, XLAL_EFUNC, "Failed to parse config-file '%s'", cfgname );
 
   /* Check for a section we have and one we don't */
@@ -132,7 +132,7 @@ int main ( int argc, char *argv[])
   XLAL_CHECK ( testBool == 0, XLAL_EFAILED, "%s: got testBool = %d, expected 0\n", cfgname, testBool );
 
   // ---------- TEST 3: check reading of compressed files ----------
-  cfgname = DATADIR "ConfigFileSample3.cfg.gz";
+  cfgname = TEST_DATA_DIR "ConfigFileSample3.cfg.gz";
   XLAL_CHECK ( XLALParseDataFile ( &cfgdata, cfgname ) == XLAL_SUCCESS, XLAL_EFUNC );
 
   XLAL_CHECK ( cfgdata->lines->nTokens == 4, XLAL_EFAILED );

lal/lib/lalsupport/test/Makefile.am

-AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -DDATADIR='"$(abs_srcdir)/"'
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -DTEST_DATA_DIR='"$(abs_srcdir)/"'
 LDADD = \
 	$(top_builddir)/lib/lal/liblal.la \
 	$(top_builddir)/lib/lalsupport/src/liblalsupport.la

lal/lib/lalsupport/test/SegmentsIOTest.c

@@ -140,7 +140,7 @@ int main( int argc, char *argv[] )
   XLALPrintInfo("\n========== LALSegListRead tests \n");
   /*-------------------------------------------------------------------------*/
 
-  LALSegListRead( &status, &seglist1, DATADIR "SegmentsInput1.data", "" );
+  LALSegListRead( &status, &seglist1, TEST_DATA_DIR "SegmentsInput1.data", "" );
   if ( status.statusCode ) {
     RETFAIL( "LALSegListRead with standard segment list file",
 	     status.statusCode );

lal/lib/lalsupport/test/StreamInputTest.c

@@ -99,7 +99,7 @@ type-dependent format.
 
 /* Default parameter settings. */
 extern int lalDebugLevel;
-#define INFILE DATADIR "StreamInput.data"
+#define INFILE TEST_DATA_DIR "StreamInput.data"
 
 /* Usage format string. */
 #define USAGE "Usage: %s [-o outfile] [-d debuglevel] [-t]\n"        \

lal/lib/lalsupport/test/StreamSeriesInputTest.c

@@ -88,7 +88,7 @@ data file formats.
 
 /* Default parameter settings. */
 extern int lalDebugLevel;
-#define INFILE DATADIR "StreamSeriesInput.data"
+#define INFILE TEST_DATA_DIR "StreamSeriesInput.data"
 
 /* Usage format string. */
 #define USAGE "Usage: %s [-o outfile] [-d debuglevel]\n"        \

lal/packages/tools/test/LALBarycenterTest.c

@@ -91,9 +91,9 @@ main( void )
 {
   static LALStatus status;
 
-  char eEphFileBad[] = DATADIR "earth47.dat";
-  char eEphFile[] = DATADIR "earth98.dat";
-  char sEphFile[] = DATADIR "sun98.dat";
+  char eEphFileBad[] = TEST_DATA_DIR "earth47.dat";
+  char eEphFile[] = TEST_DATA_DIR "earth98.dat";
+  char sEphFile[] = TEST_DATA_DIR "sun98.dat";
 
   /* Checking response if data files not present */
   EphemerisData edat;

lal/packages/tools/test/Makefile.am

-AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -DDATADIR='"$(abs_srcdir)/"'
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -DTEST_DATA_DIR='"$(abs_srcdir)/"'
 LDADD = \
 	$(top_builddir)/lib/lal/liblal.la \
 	$(top_builddir)/lib/lalsupport/src/liblalsupport.la

lalburst/test/CLRTest.c

@@ -181,7 +181,7 @@ int main ( void )
   /* read data  x(t) */
   /* insert here your own data from a given file/frame */
 
-  in_file = fopen(DATADIR "CLRindata.asc", "r");
+  in_file = fopen(TEST_DATA_DIR "CLRindata.asc", "r");
   for (i = 0; i < (int)n; ++i) {
     number = fscanf(in_file, "%f\n", &dummy );
     x->data[i] = dummy;

lalburst/test/Makefile.am

-AM_CFLAGS = $(LALSUPPORT_CFLAGS) -DDATADIR='"$(abs_srcdir)/"'
+AM_CFLAGS = $(LALSUPPORT_CFLAGS) -DTEST_DATA_DIR='"$(abs_srcdir)/"'
 LDADD = $(LALSUPPORT_LIBS) $(top_builddir)/src/liblalburst.la
 
 check_PROGRAMS = \

lalburst/test/TrackSearchTest.c

@@ -47,7 +47,7 @@ int main( void )
   params.low= 3; /* 1 */
   params.low = params.high/3; /* ? */
   /* open an input pgm file */
-  fp = fopen(DATADIR "a.pgm", "rb");
+  fp = fopen(TEST_DATA_DIR "a.pgm", "rb");
   str = fgets(stringd,255,fp);
   if (str == NULL)
   {

lalpulsar/test/BinarySSBTimesTest.c

@@ -91,8 +91,8 @@ main ( int argc, char *argv[] )
   REAL8 startTimeREAL8 	= 714180733;
   REAL8 duration 	= 180000;	/* 50 hours */
   REAL8 Tsft 		= 1800;		/* assume 30min SFTs */
-  char earthEphem[] 	= DATADIR "earth00-19-DE200.dat.gz";
-  char sunEphem[]   	= DATADIR "sun00-19-DE200.dat.gz";
+  char earthEphem[] 	= TEST_DATA_DIR "earth00-19-DE200.dat.gz";
+  char sunEphem[]   	= TEST_DATA_DIR "sun00-19-DE200.dat.gz";
 
   //REAL8 tolerance = 2e-10;	/* same algorithm, should be basically identical results */
 

lalpulsar/test/GeneralMeshTest.c

@@ -214,8 +214,8 @@ int main( int argc, char **argv )
   float a, b, c, d, e, f;         /* To specify center of search region */
   BOOLEAN rectangular;            /* is the search region rectangular? */
 
-  char earth[] = DATADIR "earth00-19-DE405.dat.gz";
-  char sun[]   = DATADIR "sun00-19-DE405.dat.gz";
+  char earth[] = TEST_DATA_DIR "earth00-19-DE405.dat.gz";
+  char sun[]   = TEST_DATA_DIR "sun00-19-DE405.dat.gz";
 
   /* Set default values. */
   metric_code = 1;

lalpulsar/test/GeneralMetricTest.c

@@ -200,8 +200,8 @@ int main( int argc, char *argv[] ) {
   REAL4           f0;               /* carrier frequency */
   UINT2           numSpindown;      /* Number of spindowns */
 
-  char earth[] = DATADIR "earth00-19-DE405.dat.gz";
-  char sun[]   = DATADIR "sun00-19-DE405.dat.gz";
+  char earth[] = TEST_DATA_DIR "earth00-19-DE405.dat.gz";
+  char sun[]   = TEST_DATA_DIR "sun00-19-DE405.dat.gz";
 
   lalDebugLevel = 0;
 

lalpulsar/test/GeneratePulsarSignalTest.c

@@ -189,8 +189,8 @@ void RunGeneratePulsarSignalTest(LALStatus *status)
   CHAR IFO[6] = "LHO";
   EphemerisData *edat = NULL;
 
-  char earthFile[] = DATADIR "earth00-19-DE405.dat.gz";
-  char sunFile[]   = DATADIR "sun00-19-DE405.dat.gz";
+  char earthFile[] = TEST_DATA_DIR "earth00-19-DE405.dat.gz";
+  char sunFile[]   = TEST_DATA_DIR "sun00-19-DE405.dat.gz";
 
   /* containers for sky position and spindown data */
   REAL8 **skyPosData;

lalpulsar/test/GetAMCoeffsTest.c

@@ -113,8 +113,8 @@ int main(int argc, char *argv[])
   const CHAR *sites[] = {"H1", "L1", "V2", "G1", "T1" };
   UINT4 pickedSite;
 
-  char earthEphem[] = DATADIR "earth00-19-DE405.dat.gz";
-  char sunEphem[]   = DATADIR "sun00-19-DE405.dat.gz";
+  char earthEphem[] = TEST_DATA_DIR "earth00-19-DE405.dat.gz";
+  char sunEphem[]   = TEST_DATA_DIR "sun00-19-DE405.dat.gz";
 
   lalDebugLevel = 0;
   if ( argc == 2 && !strcmp(argv[1], "-v1") )

lalpulsar/test/LALPulsarXMLTest.c

@@ -248,7 +248,7 @@ int testPulsarDopplerParams(void)
 int validateDocument(const xmlDocPtr xmlDocument)
 {
     /* set up local variables */
-    char schemaUrl[] = "file://" DATADIR "VOTable-1.1.xsd";
+    char schemaUrl[] = "file://" TEST_DATA_DIR "VOTable-1.1.xsd";
     int result;
 
     /* validate document */

lalpulsar/test/Makefile.am

-AM_CFLAGS = $(LALSUPPORT_CFLAGS) -DDATADIR='"$(abs_srcdir)/"'
+AM_CFLAGS = $(LALSUPPORT_CFLAGS) -DTEST_DATA_DIR='"$(abs_srcdir)/"'
 LDADD = $(LALSUPPORT_LIBS) $(top_builddir)/src/liblalpulsar.la
 
 if LALXML

lalpulsar/test/NewGetAMCoeffsTest.c

@@ -135,8 +135,8 @@ int main(int argc, char *argv[])
   BOOLEAN ignoreErrors = 0; /* Don't fail if tolerance exceeded */
   UINT4 numChecks = 1; /* Number of times to check */
 
-  char earthEphem[] = DATADIR "earth00-19-DE405.dat.gz";
-  char sunEphem[]   = DATADIR "sun00-19-DE405.dat.gz";
+  char earthEphem[] = TEST_DATA_DIR "earth00-19-DE405.dat.gz";
+  char sunEphem[]   = TEST_DATA_DIR "sun00-19-DE405.dat.gz";
 
   /* ----- old testing code to use 9 degree earth rotations ----- */
   /* startTime.gpsSeconds = 714275242;

lalpulsar/test/SFTfileIOTest.c

@@ -204,34 +204,34 @@ int main(int argc, char *argv[])
     argc = 1;
 
   /* check that mal-formated SFTs are properly detected */
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad1", NULL ), &status);
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad2", NULL ), &status);
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad3", NULL ), &status);
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad4", NULL ), &status);
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad5", NULL ), &status);
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad1", NULL ), &status);
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad2", NULL ), &status);
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad3", NULL ), &status);
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad4", NULL ), &status);
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad5", NULL ), &status);
 
   /* the following (SFT-bad6) has a wrong CRC64 checksum. However, this is
    * not checked in LALSFTdataFind, so it should succeed! */
-  SHOULD_WORK( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad6", NULL ), &status );
+  SHOULD_WORK( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad6", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
 
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad7", NULL ), &status);
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad8", NULL ), &status);
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad9", NULL ), &status);
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad10", NULL ), &status );
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad11", NULL ), &status );
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad12", NULL ), &status );
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad13", NULL ), &status );
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-bad14", NULL ), &status );
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad7", NULL ), &status);
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad8", NULL ), &status);
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad9", NULL ), &status);
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad10", NULL ), &status );
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad11", NULL ), &status );
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad12", NULL ), &status );
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad13", NULL ), &status );
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-bad14", NULL ), &status );
 
   /* now check some crc-checksums */
-  SHOULD_WORK( LALCheckSFTs ( &status, &crc_check, DATADIR "SFT-test1", NULL ), &status );
+  SHOULD_WORK( LALCheckSFTs ( &status, &crc_check, TEST_DATA_DIR "SFT-test1", NULL ), &status );
   if ( crc_check != 0 )
     {
       XLALPrintError ("\nLALCheckSFTs(): SFT-test1 has correct checksum but LALCheckSFTs claimed it hasn't.\n\n");
       return crc_check;
     }
-  SHOULD_WORK( LALCheckSFTs ( &status, &crc_check, DATADIR "SFT-bad6", NULL ), &status );
+  SHOULD_WORK( LALCheckSFTs ( &status, &crc_check, TEST_DATA_DIR "SFT-bad6", NULL ), &status );
   if ( crc_check != SFTFILEIO_ECRC64 )
     {
       XLALPrintError ( "\nLALCheckSFTs() failed to catch invalid CRC checksum in SFT-bad6 \n\n");
@@ -239,36 +239,36 @@ int main(int argc, char *argv[])
     }
 
   /* check that proper v2-SFTs are read-in properly */
-  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test1", NULL ), &status );
+  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test1", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
-  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test2", NULL ), &status );
+  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test2", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
-  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test3", NULL ), &status );
+  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test3", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
-  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test4", NULL ), &status );
+  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test4", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
-  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test5", NULL ), &status );
+  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test5", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
-  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test6", NULL ), &status );
+  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test6", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
-  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test7", NULL ), &status );
+  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test7", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
 
   /* now completely read-in a v2 merged-SFT */
-  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test*", NULL ), &status );
+  SHOULD_FAIL ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test*", NULL ), &status );
   /* skip sft nr 4 with has Tsft=50 instead of Tsft=60 */
-  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test[123567]*", NULL ), &status );
+  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test[123567]*", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
   /* try the same with a ";" separated list of files and of patterns */
   SHOULD_WORK ( LALSFTdataFind ( &status, &catalog,
-				 DATADIR "SFT-test1;"
-				 DATADIR "SFT-test2;"
-				 DATADIR "SFT-test3;"
-				 DATADIR "SFT-test5;"
-				 DATADIR "SFT-test6;"
-				 DATADIR "SFT-test7", NULL ), &status );
+				 TEST_DATA_DIR "SFT-test1;"
+				 TEST_DATA_DIR "SFT-test2;"
+				 TEST_DATA_DIR "SFT-test3;"
+				 TEST_DATA_DIR "SFT-test5;"
+				 TEST_DATA_DIR "SFT-test6;"
+				 TEST_DATA_DIR "SFT-test7", NULL ), &status );
   SUB ( LALDestroySFTCatalog( &status, &catalog), &status );
-  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, DATADIR "SFT-test[123]*;" DATADIR "SFT-test[5]*", NULL ), &status );
+  SHOULD_WORK ( LALSFTdataFind ( &status, &catalog, TEST_DATA_DIR "SFT-test[123]*;" TEST_DATA_DIR "SFT-test[5]*", NULL ), &status );
 
   /* load once as a single SFT-vector (mix of detectors) */
   SHOULD_WORK ( LALLoadSFTs ( &status, &sft_vect, catalog, -1, -1 ), &status );
@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
   /* `----- v1 SFT writing */
 
   /* read v1-SFTs: 'inputsft.0' and 'inputsft.1' (one is big-endian, the other little-endian!) */
-  SUB ( LALSFTdataFind (&status, &catalog, DATADIR "inputsft.?", &constraints ), &status );
+  SUB ( LALSFTdataFind (&status, &catalog, TEST_DATA_DIR "inputsft.?", &constraints ), &status );
   SUB ( LALLoadSFTs ( &status, &sft_vect, catalog, fMin, fMax ), &status );
   if ( sft_vect->length != 2 )
     {
@@ -483,9 +483,9 @@ int main(int argc, char *argv[])
     LIGOTimeGPSVector *ts1 = NULL, *ts2 = NULL;
 
     /* ----- load timestamps with deprecated LAL function  */
-    SUB ( LALReadTimestampsFile ( &status, &ts1, DATADIR TS_FNAME ), &status );
+    SUB ( LALReadTimestampsFile ( &status, &ts1, TEST_DATA_DIR TS_FNAME ), &status );
     /* ----- load timestamps w new XLAL function */
-    if ( (ts2 = XLALReadTimestampsFile ( DATADIR TS_FNAME )) == NULL ) {
+    if ( (ts2 = XLALReadTimestampsFile ( TEST_DATA_DIR TS_FNAME )) == NULL ) {
       XLALPrintError ("XLALReadTimestampsFile() failed to read timestamps from file '%s'. xlalErrno = %d\n", TS_FNAME );
       return SFTFILEIOTESTC_ESUB;
     }

lalpulsar/test/TestVelocity.c

@@ -101,8 +101,8 @@ INT4 lalDebugLevel=7;
 
 /* Locations of the earth and sun ephemeris data */
 
-#define EARTHDATAFILE DATADIR  "earth00-19-DE405.dat.gz";
-#define SUNDATAFILE DATADIR    "sun00-19-DE405.dat.gz";
+#define EARTHDATAFILE TEST_DATA_DIR  "earth00-19-DE405.dat.gz";
+#define SUNDATAFILE TEST_DATA_DIR    "sun00-19-DE405.dat.gz";
 
 char EARTHDATA[] = EARTHDATAFILE;
 char SUNDATA[] = SUNDATAFILE;

lalpulsar/test/UniversalDopplerMetricTest.c

@@ -105,8 +105,8 @@ test_XLALDopplerFstatMetric ( void )
   REAL8 tolPh = 0.01;	// 1% tolerance on phase metrics [taken from testMetricCodes.py]
 
   // ----- load ephemeris
-  char earthEphem[] = DATADIR "earth00-19-DE200.dat.gz";
-  char sunEphem[]   = DATADIR "sun00-19-DE200.dat.gz";
+  char earthEphem[] = TEST_DATA_DIR "earth00-19-DE200.dat.gz";
+  char sunEphem[]   = TEST_DATA_DIR "sun00-19-DE200.dat.gz";
   EphemerisData *edat = XLALInitBarycenter ( earthEphem, sunEphem );
   XLAL_CHECK ( edat != NULL, XLAL_EFUNC, "XLALInitBarycenter('%s','%s') failed with xlalErrno = %d\n", earthEphem, sunEphem, xlalErrno );
 
@@ -403,8 +403,8 @@ test_XLALComputeOrbitalDerivatives ( void )
 {
   // ----- load an example ephemeris, describing a pure cicular 2D
   // orbit w period of one year
-  CHAR earthEphem[] = DATADIR "circularEphem.dat";
-  CHAR sunEphem[]   = DATADIR "sun00-19-DE405.dat";
+  CHAR earthEphem[] = TEST_DATA_DIR "circularEphem.dat";
+  CHAR sunEphem[]   = TEST_DATA_DIR "sun00-19-DE405.dat";
 
   EphemerisData *edat = XLALInitBarycenter ( earthEphem, sunEphem );
   XLAL_CHECK ( edat != NULL, XLAL_EFUNC, "XLALInitBarycenter('%s','%s') failed with xlalErrno = %d\n", earthEphem, sunEphem, xlalErrno );

lalpulsar/test/XLALComputeAMTest.c

@@ -80,8 +80,8 @@ int main(int argc, char *argv[])
 
   REAL8 tolerance = 2e-6;	/* same algorithm, should be basically identical results */
 
-  char earthEphem[] = DATADIR "earth00-19-DE405.dat.gz";
-  char sunEphem[]   = DATADIR "sun00-19-DE405.dat.gz";
+  char earthEphem[] = TEST_DATA_DIR "earth00-19-DE405.dat.gz";
+  char sunEphem[]   = TEST_DATA_DIR "sun00-19-DE405.dat.gz";
 
   UINT4 numChecks = 1; /* Number of times to check */
 

lalxml/test/LALXMLTest.c

@@ -730,7 +730,7 @@ int testTable ( void )
 int validateDocument(const xmlDocPtr xmlDocument)
 {
     /* set up local variables */
-    char schemaUrl[] = "file://" DATADIR "VOTable-1.1.xsd";
+    char schemaUrl[] = "file://" TEST_DATA_DIR "VOTable-1.1.xsd";
     int result;
 
     /* validate document */

lalxml/test/Makefile.am

-AM_CFLAGS = $(LALSUPPORT_CFLAGS) -DDATADIR='"$(abs_srcdir)/"'
+AM_CFLAGS = $(LALSUPPORT_CFLAGS) -DTEST_DATA_DIR='"$(abs_srcdir)/"'
 LDADD = $(LALSUPPORT_LIBS) $(top_builddir)/src/liblalxml.la
 
 check_PROGRAMS = LALXMLTest