From e12d2e6818c4b860916cc96b8f53062ff1f542bb Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 29 Jun 2016 10:05:00 +0200
Subject: [PATCH] tests: made pam check independent of builddir

---
 tests/common.sh                   | 8 ++++----
 tests/data/test-pam-noauth.config | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/common.sh b/tests/common.sh
index da899b37..c508d615 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -89,13 +89,13 @@ launch_sr_server() {
 }
 
 launch_sr_pam_server() {
-       mkdir -p data/$PAMDIR/
-       test -f "${srcdir}/data/$PAMDIR/users.oath.templ" && cp "${srcdir}/data/$PAMDIR/users.oath.templ" data/$PAMDIR/users.oath
-       test -f "${srcdir}/data/$PAMDIR/passdb.templ" && cp "${srcdir}/data/$PAMDIR/passdb.templ" data/$PAMDIR/passdb
+       mkdir -p "data/$PAMDIR/"
+       test -f "${srcdir}/data/$PAMDIR/users.oath.templ" && cp "${srcdir}/data/$PAMDIR/users.oath.templ" "data/$PAMDIR/users.oath"
+       test -f "${srcdir}/data/$PAMDIR/passdb.templ" && cp "${srcdir}/data/$PAMDIR/passdb.templ" "data/$PAMDIR/passdb"
 
        export NSS_WRAPPER_PASSWD=./data/pam/nss-passwd
        export NSS_WRAPPER_GROUP=./data/pam/nss-group
-       LD_PRELOAD=libnss_wrapper.so:libpam_wrapper.so:libsocket_wrapper.so:libuid_wrapper.so PAM_WRAPPER_SERVICE_DIR="${srcdir}/data/$PAMDIR" PAM_WRAPPER=1  UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* & #>/dev/null 2>&1 &
+       LD_PRELOAD=libnss_wrapper.so:libpam_wrapper.so:libsocket_wrapper.so:libuid_wrapper.so PAM_WRAPPER_SERVICE_DIR="data/$PAMDIR" PAM_WRAPPER=1  UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* & #>/dev/null 2>&1 &
        LOCALPID="$!";
        unset NSS_WRAPPER_PASSWD
        unset NSS_WRAPPER_GROUP
diff --git a/tests/data/test-pam-noauth.config b/tests/data/test-pam-noauth.config
index d289df55..c637a41a 100644
--- a/tests/data/test-pam-noauth.config
+++ b/tests/data/test-pam-noauth.config
@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[./data/test-pam.passwd]"
+auth = "plain[@SRCDIR@/data/test-pam.passwd]"
 acct = "pam"
 
 # A banner to be displayed on clients