* 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

diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 6a28d67535555ee342cace97096fcb7750645731..2638c09e15642ea71b5465e4331aceb82d0768c3 100644 (file)
--- 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 a3470ab25c9b738f4475431db32b588a0722e378..5b59cb71868a12bd978d813c7bca94e6fb45e9cc 100755 (executable)
--- 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