From d851033e6c99d2a93d44f3b3716277a709103881 Mon Sep 17 00:00:00 2001
From: Andrzej Kurek <andrzej.kurek@arm.com>
Date: Thu, 1 Mar 2018 09:20:34 -0500
Subject: [PATCH] PKCS11: Move syslog2stderr.c to programs/test

---
 programs/.gitignore                     | 2 +-
 programs/Makefile                       | 5 +++--
 programs/{util => test}/syslog2stderr.c | 0
 tests/scripts/pkcs11-client-test.sh     | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename programs/{util => test}/syslog2stderr.c (100%)

diff --git a/programs/.gitignore b/programs/.gitignore
index 05fb0b621..60942d76e 100644
--- a/programs/.gitignore
+++ b/programs/.gitignore
@@ -49,7 +49,7 @@ test/ssl_cert_test
 test/udp_proxy
 util/pem2der
 util/strerror
-util/syslog2stderr.so
+test/syslog2stderr.so
 x509/cert_app
 x509/cert_req
 x509/crl_app
diff --git a/programs/Makefile b/programs/Makefile
index 163059b54..805ab20fa 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -278,14 +278,15 @@ x509/req_app$(EXEXT): x509/req_app.c $(DEP)
 	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) x509/req_app.c    $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
 
 ifndef WINDOWS
-util/syslog2stderr.so: util/syslog2stderr.c
-	echo "  CC    util/syslog2stderr.c"
+test/syslog2stderr.so: test/syslog2stderr.c
+	echo "  CC    test/syslog2stderr.c"
 	$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -ldl
 endif
 
 clean:
 ifndef WINDOWS
 	rm -f $(APPS)
+	rm -f test/syslog2stderr.so
 else
 	del /S /Q /F *.o *.exe
 endif
diff --git a/programs/util/syslog2stderr.c b/programs/test/syslog2stderr.c
similarity index 100%
rename from programs/util/syslog2stderr.c
rename to programs/test/syslog2stderr.c
diff --git a/tests/scripts/pkcs11-client-test.sh b/tests/scripts/pkcs11-client-test.sh
index 37e08c737..05f819213 100755
--- a/tests/scripts/pkcs11-client-test.sh
+++ b/tests/scripts/pkcs11-client-test.sh
@@ -17,13 +17,13 @@ fi
 # The SoftHSM library sends error messages to the system logs. If possible, send
 # the messages to standard error instead, by overloading the logging functions.
 if [ -n "${TOPDIR+1}" ] &&
-     make -C "$TOPDIR/programs" util/syslog2stderr.so >/dev/null 2>&1
+     make -C "$TOPDIR/programs" test/syslog2stderr.so >/dev/null 2>&1
 then
   case $(uname) in
     Darwin)
-      export DYLD_PRELOAD="${DYLD_PRELOAD-}:$TOPDIR/programs/util/syslog2stderr.so";;
+      export DYLD_PRELOAD="${DYLD_PRELOAD-}:$TOPDIR/programs/test/syslog2stderr.so";;
     *)
-      export LD_PRELOAD="${LD_PRELOAD-}:$TOPDIR/programs/util/syslog2stderr.so";;
+      export LD_PRELOAD="${LD_PRELOAD-}:$TOPDIR/programs/test/syslog2stderr.so";;
   esac
 fi