3 files changed, 24 insertions, 22 deletions

diff --git a/libraries/eet/src/tests/Makefile.am b/libraries/eet/src/tests/Makefile.am
index c90a1d5..61158f7 100644
--- a/libraries/eet/src/tests/Makefile.am
+++ b/libraries/eet/src/tests/Makefile.am
@@ -2,6 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests\" \
 @CHECK_CFLAGS@ \
 @EINA_CFLAGS@
 
diff --git a/libraries/eet/src/tests/Makefile.in b/libraries/eet/src/tests/Makefile.in
index bb15127..791f9fd 100644
--- a/libraries/eet/src/tests/Makefile.in
+++ b/libraries/eet/src/tests/Makefile.in
@@ -174,8 +174,6 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -246,6 +244,7 @@ version_info = @version_info@
 MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests\" \
 @CHECK_CFLAGS@ \
 @EINA_CFLAGS@
 
diff --git a/libraries/eet/src/tests/eet_suite.c b/libraries/eet/src/tests/eet_suite.c
index 5230c86..3bbc912 100644
--- a/libraries/eet/src/tests/eet_suite.c
+++ b/libraries/eet/src/tests/eet_suite.c
@@ -24,6 +24,8 @@
 
 #include "eet_suite.h"
 
+#define CERT_DIR ((*TESTS_SRC_DIR == '/') ? TESTS_SRC_DIR : "src/tests/" TESTS_SRC_DIR)
+
 START_TEST(eet_test_init)
 {
    int ret;
@@ -211,21 +213,21 @@ _eet_test_basic_check(Eet_Test_Basic_Type *result,
    fail_if(result->empty != NULL);
    if (i == 0)
      {
-        Eet_Test_Basic_Type *tmp;
-
-        tmp = result->with;
-        fail_if(tmp == NULL);
-
-        fail_if(tmp->c != EET_TEST_CHAR);
-        fail_if(tmp->s != EET_TEST_SHORT);
-        fail_if(tmp->i != EET_TEST_INT + i + 1);
-        fail_if(tmp->l != (long long)EET_TEST_LONG_LONG);
-        fail_if(strcmp(tmp->str, EET_TEST_STRING) != 0);
-        fail_if(strcmp(tmp->istr, EET_TEST_STRING) != 0);
-        fail_if(tmp->uc != EET_TEST_CHAR);
-        fail_if(tmp->us != EET_TEST_SHORT);
-        fail_if(tmp->ui != EET_TEST_INT);
-        fail_if(tmp->ul != EET_TEST_LONG_LONG);
+        Eet_Test_Basic_Type *tmp2;
+
+        tmp2 = result->with;
+        fail_if(tmp2 == NULL);
+
+        fail_if(tmp2->c != EET_TEST_CHAR);
+        fail_if(tmp2->s != EET_TEST_SHORT);
+        fail_if(tmp2->i != EET_TEST_INT + i + 1);
+        fail_if(tmp2->l != (long long)EET_TEST_LONG_LONG);
+        fail_if(strcmp(tmp2->str, EET_TEST_STRING) != 0);
+        fail_if(strcmp(tmp2->istr, EET_TEST_STRING) != 0);
+        fail_if(tmp2->uc != EET_TEST_CHAR);
+        fail_if(tmp2->us != EET_TEST_SHORT);
+        fail_if(tmp2->ui != EET_TEST_INT);
+        fail_if(tmp2->ul != EET_TEST_LONG_LONG);
      }
    else
      fail_if(result->with != NULL);
@@ -1640,7 +1642,7 @@ START_TEST(eet_identity_simple)
    eet_init();
 
    fail_if(!(file = tmpnam(file)));
-   fail_if(chdir("src/tests"));
+   fail_if(chdir(CERT_DIR));
    fail_if(!(noread = fopen("/dev/null", "w")));
 
    /* Sign an eet file. */
@@ -1707,7 +1709,7 @@ START_TEST(eet_identity_open_simple)
 
    eet_init();
 
-   fail_if(chdir("src/tests"));
+   fail_if(chdir(CERT_DIR));
 
    k = eet_identity_open("cert.pem", "key.pem", NULL);
    fail_if(!k);
@@ -1725,7 +1727,7 @@ START_TEST(eet_identity_open_pkcs8)
 
    eet_init();
 
-   fail_if(chdir("src/tests"));
+   fail_if(chdir(CERT_DIR));
 
    k = eet_identity_open("cert.pem", "key_enc_none.pem", NULL);
    fail_if(!k);
@@ -1774,7 +1776,7 @@ START_TEST(eet_identity_open_pkcs8_enc)
 
    eet_init();
 
-   fail_if(chdir("src/tests"));
+   fail_if(chdir(CERT_DIR));
 
    k = eet_identity_open("cert.pem", "key_enc.pem", NULL);
    fail_if(k);
@@ -1810,7 +1812,7 @@ START_TEST(eet_cipher_decipher_simple)
    eet_init();
 
    fail_if(!(file = tmpnam(file)));
-   fail_if(chdir("src/tests"));
+   fail_if(chdir(CERT_DIR));
 
    /* Crypt an eet file. */
    ef = eet_open(file, EET_FILE_MODE_WRITE);