PKCS11: Move syslog2stderr.c to programs/test
diff --git a/programs/.gitignore b/programs/.gitignore
index 05fb0b6..60942d76 100644
--- a/programs/.gitignore
+++ b/programs/.gitignore
@@ -49,7 +49,7 @@
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 163059b..805ab20 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -278,14 +278,15 @@
$(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 37e08c7..05f8192 100755
--- a/tests/scripts/pkcs11-client-test.sh
+++ b/tests/scripts/pkcs11-client-test.sh
@@ -17,13 +17,13 @@
# 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