diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-01-22 16:33:48 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-01-22 17:01:40 +0100 |
| commit | 4a516cbcd9b318effff6a1085e9536b870de606a (patch) | |
| tree | cb666b60033ed108fc26b3008b5cdc8604c2e3cb | |
| parent | c0dc4556e8d2e80c4f04c1655ed33e3bb659aa67 (diff) | |
| download | gnutls-4a516cbcd9b318effff6a1085e9536b870de606a.tar.gz | |
tests: better checking for failure in windows cng check
| -rw-r--r-- | tests/windows/Makefile.am | 8 | ||||
| -rwxr-xr-x | tests/windows/check-output | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/tests/windows/Makefile.am b/tests/windows/Makefile.am index e8d4568e24..f8037a2715 100644 --- a/tests/windows/Makefile.am +++ b/tests/windows/Makefile.am @@ -30,7 +30,7 @@ if ENABLE_MINITASN1 AM_CPPFLAGS += -I$(top_builddir)/lib/minitasn1 endif -EXTRA_DIST = ncrypt-int.h +EXTRA_DIST = ncrypt-int.h check-output AM_LDFLAGS = -no-install LDADD = $(top_builddir)/tests/libutils.la \ @@ -50,16 +50,20 @@ crypt32_la_LIBADD = ../../gl/libgnu.la ../../lib/libgnutls.la -lmsvcrt -lkernel3 ncrypt_la_LDFLAGS = -module -no-undefined -avoid-version -Wl,--add-stdcall-alias crypt32_la_LDFLAGS = -module -no-undefined -avoid-version -Wl,--add-stdcall-alias -ctests += cng-windows cng_windows_DEPENDENCIES = ncrypt.la crypt32.la cng_windows_CPPFLAGS = $(AM_CPPFLAGS) +LOG_COMPILER = ./check-output + endif +ctests += cng-windows + check_PROGRAMS = $(ctests) dist_check_SCRIPTS = + TESTS = $(ctests) $(dist_check_SCRIPTS) TESTS_ENVIRONMENT = \ diff --git a/tests/windows/check-output b/tests/windows/check-output new file mode 100755 index 0000000000..8516c072f1 --- /dev/null +++ b/tests/windows/check-output @@ -0,0 +1,17 @@ +#!/bin/sh + +TMPFILE=wine.$$.out + +wine $* >$TMPFILE + +grep -i "Unhandled exception" $TMPFILE +if test $? = 0;then + ret=1 +else + ret=0 +fi + +echo $TMPFILE +rm -f $TMPFILE + +exit $ret |