From 09da241e16295d4e63f37eceed7860b2a465b753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 24 Nov 2011 12:02:02 +0100
Subject: [PATCH] * testsuite/sexp-conv-test: Use $EMULATOR when running test
programs. Also ignore \r for output in the non-canonical output formats.
* testsuite/Makefile.in (check): Pass $(EMULATOR) in the
environment of run-tests.
Rev: nettle/testsuite/Makefile.in:1.15
Rev: nettle/testsuite/sexp-conv-test:1.4
---
testsuite/Makefile.in | 2 +-
testsuite/sexp-conv-test | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 6a28d675..2638c09e 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -89,7 +89,7 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) \
# The PATH update is for locating dlls on w*ndows.
check: $(TS_ALL) $(srcdir)/run-tests
LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
- $(srcdir)/run-tests $(TS_ALL)
+ EMULATOR="$(EMULATOR)" $(srcdir)/run-tests $(TS_ALL)
Makefile: $(srcdir)/Makefile.in ../config.status
diff --git a/testsuite/sexp-conv-test b/testsuite/sexp-conv-test
index a3470ab2..5b59cb71 100755
--- a/testsuite/sexp-conv-test
+++ b/testsuite/sexp-conv-test
@@ -14,7 +14,7 @@ print_nl () {
test_advanced () {
print_raw "$1" test.in
- if ../tools/sexp-conv -s advanced <test.in >test1.out ; then
+ if $EMULATOR ../tools/sexp-conv -s advanced <test.in | tr -d '\r' >test1.out ; then
true
else
exit 1
@@ -30,7 +30,7 @@ test_advanced () {
test_advanced_hex () {
print_raw "$1" test.in
- if ../tools/sexp-conv -s hex <test.in >test1.out ; then
+ if $EMULATOR ../tools/sexp-conv -s hex <test.in | tr -d '\r' >test1.out ; then
true
else
exit 1
@@ -46,7 +46,7 @@ test_advanced_hex () {
test_transport () {
print_raw "$1" test.in
- if ../tools/sexp-conv -s transport <test.in >test1.out ; then
+ if $EMULATOR ../tools/sexp-conv -s transport <test.in | tr -d '\r' >test1.out ; then
true
else
exit 1
@@ -62,7 +62,7 @@ test_transport () {
test_canonical () {
print_raw "$1" test.in
- if ../tools/sexp-conv -s canonical <test.in >test1.out ; then
+ if $EMULATOR ../tools/sexp-conv -s canonical <test.in >test1.out ; then
true
else
exit 1
--
GitLab