From 5a4d78305c50eb05f4594ed4666dfa9a2323412c Mon Sep 17 00:00:00 2001
From: Ingo Huerner <ingo_huerner@mentor.com>
Date: Fri, 5 May 2017 13:29:36 +0200
Subject: Changed location of test data

---
 test/Makefile.am                | 7 ++++---
 test/test_pco_key_value_store.c | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 06c2ac4..0d52584 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,16 +7,17 @@ AM_CFLAGS = $(DEPS_CFLAGS) $(CHECK_CFLAGS)
 
 endif
 
-localstate_DATA = data/attachToExistingCache.tar.gz data/rct_compare.tar.gz
+persdatadir = $(datadir)/persistence/test-data
+persdata_DATA = data/attachToExistingCache.tar.gz data/rct_compare.tar.gz
 
 # Add config file to distribution 
-EXTRA_DIST = $(localstate_DATA) 
+EXTRA_DIST = $(persdata_DATA) 
 
 noinst_PROGRAMS = test_pco_key_value_store persistence_common_object_test
 #persistence_sqlite_experimental
  
 test_pco_key_value_store_SOURCES = test_pco_key_value_store.c
-test_pco_key_value_store_CFLAGS = $(AM_CFLAGS) $(ARCHIVELIB_CFLAGS) $(ZLIB_CFLAGS)
+test_pco_key_value_store_CFLAGS = $(AM_CFLAGS) $(ARCHIVELIB_CFLAGS) $(ZLIB_CFLAGS) -DPERS_TEST_DATA_DIR='"$(persdatadir)"'
 test_pco_key_value_store_LDADD = $(DLT_LIBS) $(SQLITE_LIBS) $(DEPS_LIBS) $(CHECK_LIBS) $(ARCHIVELIB_LIBS) $(ZLIB_LIBS) \
    $(top_srcdir)/src/libpers_common.la
 
diff --git a/test/test_pco_key_value_store.c b/test/test_pco_key_value_store.c
index f876eb9..2d5454f 100644
--- a/test/test_pco_key_value_store.c
+++ b/test/test_pco_key_value_store.c
@@ -3334,7 +3334,7 @@ START_TEST(test_Compare_RCT)
    int result = 0;
 
    // extract test RCT databases
-   result = doUncompress("/usr/local/var/rct_compare.tar.gz", "/tmp/");
+   result = doUncompress(PERS_TEST_DATA_DIR"/rct_compare.tar.gz", "/tmp/");
    fail_unless(result == 0, "Failed to extract test data");
 
 
-- 
cgit v1.2.1