yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 13:44:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

PKCS11: Move syslog2stderr.c to programs/test

Browse Source
This commit is contained in:
Andrzej Kurek 2018-03-01 09:20:34 -05:00
parent b91a393a31
commit d851033e6c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/.gitignore vendored
View File

@ -49,7 +49,7 @@ test/ssl_cert_test
test/udp_proxy test/udp_proxy
util/pem2der util/pem2der
util/strerror util/strerror
util/syslog2stderr.so test/syslog2stderr.so
x509/cert_app x509/cert_app
x509/cert_req x509/cert_req
x509/crl_app x509/crl_app

5
programs/Makefile
View File

@ -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 $@ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) x509/req_app.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
ifndef WINDOWS ifndef WINDOWS
util/syslog2stderr.so: util/syslog2stderr.c test/syslog2stderr.so: test/syslog2stderr.c
echo " CC util/syslog2stderr.c" echo " CC test/syslog2stderr.c"
$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -ldl $(CC) $(CFLAGS) -fPIC -shared -o $@ $< -ldl
endif endif
clean: clean:
ifndef WINDOWS ifndef WINDOWS
rm -f $(APPS) rm -f $(APPS)
rm -f test/syslog2stderr.so
else else
del /S /Q /F *.o *.exe del /S /Q /F *.o *.exe
endif endif

0
programs/util/syslog2stderr.c → programs/test/syslog2stderr.c
View File

6
tests/scripts/pkcs11-client-test.sh
View File

@ -17,13 +17,13 @@ fi
# The SoftHSM library sends error messages to the system logs. If possible, send # The SoftHSM library sends error messages to the system logs. If possible, send
# the messages to standard error instead, by overloading the logging functions. # the messages to standard error instead, by overloading the logging functions.
if [ -n "${TOPDIR+1}" ] && 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 then
case $(uname) in case $(uname) in
Darwin) 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 esac
fi fi