alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: replace non-portable use of sed by $PERL

Browse source 
This fixes one failure reported in #428 by Étienne Renault.

* tests/core/lbt.test: Here.
* tests/run.in: Export PERL.
This commit is contained in:
Alexandre Duret-Lutz 2020-09-23 11:01:05 +02:00
parent 133896d584
commit 3a6d967872
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/core/lbt.test
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (C) 2013, 2016, 2017, 2019 Laboratoire de Recherche et # Copyright (C) 2013, 2016, 2017, 2019, 2020 Laboratoire de Recherche et
# Développement de l'Epita (LRDE). # Développement de l'Epita (LRDE).
# #
# This file is part of Spot, a model checking library. # This file is part of Spot, a model checking library.
@ -99,7 +99,7 @@ test `wc -l < formulas.4` -eq 168
# Add some carriage returns to simulate MS-DOS files and # Add some carriage returns to simulate MS-DOS files and
# make sure our parser does not mind. # make sure our parser does not mind.
sed 's/$/\r/' formulas.2 > formulas.2ms $PERL -pe 's/$/\r/' formulas.2 > formulas.2ms
# The --csv-escape option is now obsolete and replaced by double # The --csv-escape option is now obsolete and replaced by double
# quotes in the format string. So eventually the first two lines # quotes in the format string. So eventually the first two lines
# should disappear. # should disappear.

5
tests/run.in
View file

@ -61,6 +61,9 @@ export top_builddir
top_srcdir='@abs_top_srcdir@' top_srcdir='@abs_top_srcdir@'
export top_srcdir export top_srcdir
PERL='@PERL@'
export PERL
# Reset those variables, as they may affect the output of DOT. # Reset those variables, as they may affect the output of DOT.
SPOT_DOTEXTRA= SPOT_DOTEXTRA=
export SPOT_DOTEXTRA export SPOT_DOTEXTRA
@ -108,7 +111,7 @@ case $1 in
*.test) *.test)
exec sh -x "$@";; exec sh -x "$@";;
*.pl) *.pl)
exec @PERL@ "$@";; exec $PERL "$@";;
*python*|*jupyter*) *python*|*jupyter*)
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath \ PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath \
exec $PREFIXCMD "$@";; exec $PREFIXCMD "$@";;