navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

shtest+configure: remove uses of non-portable/non-standard commands

Browse Source 
Replace deprecated test(1) parentheses and -a logical operator with two
tests command.

Replace deprecated  tail -1  with  tail -n1.

Replace non-standard egrep(1) command with  grep -E  ; this also
prevents obsolescence warnings on GNU systems.
This commit is contained in:
Emanuele Torre authored and GitHub committed 2023-12-11 20:46:54 +01:00
1 parent 507eb8283c
commit c2db51eeb3
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

configure.ac
+2 -2
View File
@@ -48,7 +48,7 @@ AC_CHECK_FUNCS(memmem)
AC_CHECK_HEADER("sys/cygwin.h", [have_cygwin=1;]) AC_CHECK_HEADER("sys/cygwin.h", [have_cygwin=1;])
AC_CHECK_HEADER("shlwapi.h",[have_shlwapi=1;]) AC_CHECK_HEADER("shlwapi.h",[have_shlwapi=1;])
AM_CONDITIONAL([WIN32], [test \( "x$have_shlwapi" = x1 \) -a ! \( "x$have_cygwin" = x1 \)]) AM_CONDITIONAL([WIN32], [test "x$have_shlwapi" = x1 && test ! "x$have_cygwin" = x1])
dnl Running tests with Valgrind is slow. It is faster to iterate on dnl Running tests with Valgrind is slow. It is faster to iterate on
dnl code without Valgrind until tests pass, then enable Valgrind and dnl code without Valgrind until tests pass, then enable Valgrind and
@@ -275,7 +275,7 @@ AS_IF([test "x$with_oniguruma" != xno], [
AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.]) AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.])
]) ])
]) ])
AS_IF([test "x$build_oniguruma" = xyes -a -f "${srcdir}/modules/oniguruma/configure.ac" ], [ AS_IF([test "x$build_oniguruma" = xyes && test -f "${srcdir}/modules/oniguruma/configure.ac" ], [
onig_CFLAGS="-I${srcdir}/modules/oniguruma/src" onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}" onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
AC_CONFIG_SUBDIRS([modules/oniguruma]) AC_CONFIG_SUBDIRS([modules/oniguruma])
tests/shtest
+2 -2
View File
@@ -244,7 +244,7 @@ if which seq > /dev/null 2>&1; then
if [ -n "$VALGRIND" ]; then if [ -n "$VALGRIND" ]; then
grep '^==[0-9][0-9]*== ERROR SUMMARY: 0 errors' $d/err > /dev/null grep '^==[0-9][0-9]*== ERROR SUMMARY: 0 errors' $d/err > /dev/null
else else
tail -1 $d/err | egrep -i 'assert|abort|core' && false tail -n1 -- "$d/err" | grep -Ei 'assert|abort|core' && false
fi fi
dd "if=tests/torture/input0.json" bs=$i count=1 2>/dev/null | dd "if=tests/torture/input0.json" bs=$i count=1 2>/dev/null |
@@ -252,7 +252,7 @@ if which seq > /dev/null 2>&1; then
if [ -n "$VALGRIND" ]; then if [ -n "$VALGRIND" ]; then
grep '^==[0-9][0-9]*== ERROR SUMMARY: 0 errors' $d/err > /dev/null grep '^==[0-9][0-9]*== ERROR SUMMARY: 0 errors' $d/err > /dev/null
else else
tail -1 $d/err | egrep -i 'assert|abort|core' && false tail -n1 -- "$d/err" | grep -Ei 'assert|abort|core' && false
fi fi
diff $d/out0 $d/out1 diff $d/out0 $d/out1