* 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

@@ -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

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