diff options
author | Dmitry V. Levin <ldv@strace.io> | 2023-02-14 08:00:00 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@strace.io> | 2023-02-14 08:00:00 +0000 |
commit | a871448489a7a228a89f108ec879fd447c513168 (patch) | |
tree | af595ce498a8d88f712be85f3ee1981ee7e9fd17 | |
parent | c7ecff97a4ea3df4583db6c2fe70300cd692a51f (diff) | |
download | strace-a871448489a7a228a89f108ec879fd447c513168.tar.gz |
treewide: replace "sed -r" with "sed -E"
Use -E option instead of -r to enable use extended regular expression
syntax in sed expressions. It has been supported for years by GNU sed,
and is now included in POSIX.
Link: https://www.austingroupbugs.net/view.php?id=528
Resolves: https://github.com/strace/strace/issues/216
-rwxr-xr-x | attic/qemu_multiarch_testing/make-hdc-img.sh | 2 | ||||
-rwxr-xr-x | maint/gen_xlat_defs.sh | 6 | ||||
-rwxr-xr-x | maint/ioctls_sym.sh | 6 | ||||
-rwxr-xr-x | maint/make-dsc | 2 | ||||
-rw-r--r-- | src/Makefile.am | 12 | ||||
-rwxr-xr-x | src/generate_mpers_am.sh | 4 | ||||
-rwxr-xr-x | src/generate_sen.sh | 2 | ||||
-rw-r--r-- | src/kernel_fcntl.h | 2 | ||||
-rwxr-xr-x | src/linux/mips/genstub.sh | 2 | ||||
-rwxr-xr-x | src/mpers.sh | 4 | ||||
-rw-r--r-- | src/xlat/v4l2_meta_fmts.in | 2 | ||||
-rw-r--r-- | src/xlat/v4l2_pix_fmts.in | 2 | ||||
-rw-r--r-- | src/xlat/v4l2_sdr_fmts.in | 2 | ||||
-rw-r--r-- | tests/Makefile.am | 2 | ||||
-rwxr-xr-x | tests/gen_secontext.sh | 10 | ||||
-rw-r--r-- | tests/init.sh | 4 | ||||
-rw-r--r-- | tests/ksysent.sed | 2 | ||||
-rwxr-xr-x | tests/pc.test | 8 | ||||
-rwxr-xr-x | tests/strace-S.test | 2 |
19 files changed, 38 insertions, 38 deletions
diff --git a/attic/qemu_multiarch_testing/make-hdc-img.sh b/attic/qemu_multiarch_testing/make-hdc-img.sh index 3c35f4ead..1c740ba08 100755 --- a/attic/qemu_multiarch_testing/make-hdc-img.sh +++ b/attic/qemu_multiarch_testing/make-hdc-img.sh @@ -17,7 +17,7 @@ cleanup() trap 'cleanup $?' EXIT trap 'cleanup 1' HUP PIPE INT QUIT TERM -size=$(du -ks hdc.dir | sed -rn 's/^([0-9]+).*/\1/p') +size=$(du -ks hdc.dir | sed -En 's/^([0-9]+).*/\1/p') [ "$size" -gt 0 ] rm -f hdc.img diff --git a/maint/gen_xlat_defs.sh b/maint/gen_xlat_defs.sh index 9f90d9284..8ccb06599 100755 --- a/maint/gen_xlat_defs.sh +++ b/maint/gen_xlat_defs.sh @@ -97,7 +97,7 @@ printf "/* Generated by %s -f '%s' -p '%s' -c '%s' -a '%s' */\\n" \ "$0" "$VAL_PRINT_FMT" "$REGEXP_PATTERN" \ "$COMMON_DEFS_GLOB_PATTERN" "$ARCH_DEFS_FILE" -sed -rn '/^\/\* Generated by .*\*\//d;s/^((# .*|'"$comment_re"'|'"$REGEXP_PATTERN"'[^[:space:]]*).*)?$/\2/p' | +sed -En '/^\/\* Generated by .*\*\//d;s/^((# .*|'"$comment_re"'|'"$REGEXP_PATTERN"'[^[:space:]]*).*)?$/\2/p' | uniq | while read name_ rest; do # Empty lines, comments, and "# " directives are passed verbatim. @@ -109,7 +109,7 @@ while read name_ rest; do printf '%s\n' "$name_ $rest" continue ;; esac - sed -rn 's/#[[:space:]]*define[[:space:]]+('"$name_"')[[:space:]]+([x[:xdigit:]]+).*$/\2\t\1/p' \ + sed -En 's/#[[:space:]]*define[[:space:]]+('"$name_"')[[:space:]]+([x[:xdigit:]]+).*$/\2\t\1/p' \ $LINUX_SRC/include/uapi/$COMMON_DEFS_GLOB_PATTERN | sort -n | { def= @@ -125,7 +125,7 @@ while read name_ rest; do grep -oEH '#[[:space:]]*define[[:space:]]+'"$name"'[[:space:]]+(0x[[:xdigit:]]+|[[:digit:]]+)' \ $LINUX_SRC/arch/*/include/uapi/$ARCH_DEFS_FILE | - sed -rn 's|^[^#]*/arch/([^/]+)/include/uapi/[^:]*:#[[:space:]]*define[[:space:]]+'"$name"'[[:space:]]+([^[:space:]]+)([[:space:]].*)?$|\1\t\2|p' | + sed -En 's|^[^#]*/arch/([^/]+)/include/uapi/[^:]*:#[[:space:]]*define[[:space:]]+'"$name"'[[:space:]]+([^[:space:]]+)([[:space:]].*)?$|\1\t\2|p' | sed s/parisc/hppa/ | sort | awk -vname="$name" -vdef="$def" -vfmt="$VAL_PRINT_FMT" ' diff --git a/maint/ioctls_sym.sh b/maint/ioctls_sym.sh index bc31c254c..e8ea10b57 100755 --- a/maint/ioctls_sym.sh +++ b/maint/ioctls_sym.sh @@ -431,10 +431,10 @@ process_file() i?86|x86_64*) list="$arm_list|$ppc_list|$s390_list" ;; *) list="$arm_list|$ppc_list|$s390_list|$x86_list" ;; esac - sed -r -i "/[[:space:]]($list)[[:space:]]/d" "$tmpdir"/header.out + sed -E -i "/[[:space:]]($list)[[:space:]]/d" "$tmpdir"/header.out ;; *linux/v4l2-subdev.h) - sed -r -i '/[[:space:]]VIDIOC_SUBDEV_(DV_TIMINGS_CAP|ENUM_DV_TIMINGS|ENUMSTD|G_DV_TIMINGS|G_EDID|G_STD|QUERY_DV_TIMINGS|QUERYSTD|S_DV_TIMINGS|S_EDID|S_STD)[[:space:]]/d' \ + sed -E -i '/[[:space:]]VIDIOC_SUBDEV_(DV_TIMINGS_CAP|ENUM_DV_TIMINGS|ENUMSTD|G_DV_TIMINGS|G_EDID|G_STD|QUERY_DV_TIMINGS|QUERYSTD|S_DV_TIMINGS|S_EDID|S_STD)[[:space:]]/d' \ "$tmpdir"/header.out ;; esac @@ -460,7 +460,7 @@ process_file() $READELF --wide --debug-dump=info "$tmpdir"/printents.o \ > "$tmpdir"/debug-dump - sed -r -n ' + sed -E -n ' /^[[:space:]]*<1>/,/^[[:space:]]*<1><[^>]+>: Abbrev Number: 0/!d /^[[:space:]]*<[^>]*><[^>]*>: Abbrev Number: 0/d s/^[[:space:]]*<[[:xdigit:]]+>[[:space:]]+// diff --git a/maint/make-dsc b/maint/make-dsc index 824aaefdf..5935720e7 100755 --- a/maint/make-dsc +++ b/maint/make-dsc @@ -13,7 +13,7 @@ $(sed '/^Source:[[:space:]]*/!d;q' debian/control) Binary: $(sed '/^Package:[[:space:]]*/!d;s///' debian/control | tr '\n' ' ' | sed 's/ ./,&/g') $(sed '/^Architecture:[[:space:]]*/!d;q' debian/control) -Version: $(sed -r -n '1s/^[^(]*\(([^)]+)\).*/\1/p' debian/changelog) +Version: $(sed -E -n '1s/^[^(]*\(([^)]+)\).*/\1/p' debian/changelog) $(sed '/^Maintainer:[[:space:]]*/!d;q' debian/control) $(sed '/^Homepage:[[:space:]]*/!d;q' debian/control) $(sed '/^Standards-Version:[[:space:]]*/!d;q' debian/control) diff --git a/src/Makefile.am b/src/Makefile.am index 5e5516ed1..cd4af9ae2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1091,7 +1091,7 @@ ioctl_redefs_h = $(filter-out ioctl_redefs0.h,$(subst ioctlent,ioctl_redefs,$(io ioctl_redefs%.h: ioctlent%.h ioctlent0.h sort $< > $<-t sort ioctlent0.h | comm -23 $<-t - | \ - sed -r -n 's/^\{ "([^"]+)", (0x[[:xdigit:]]+) \},$$/#ifdef \1\n# undef \1\n# define \1 \2\n#endif/p' \ + sed -E -n 's/^\{ "([^"]+)", (0x[[:xdigit:]]+) \},$$/#ifdef \1\n# undef \1\n# define \1 \2\n#endif/p' \ > $@-t rm -f $<-t mv $@-t $@ @@ -1168,7 +1168,7 @@ mpers-m%.stamp: $(srcdir_mpers_source_files) printers.h sys_func.h m%_type_defs.h: $(srcdir_mpers_source_files) for f in $^; do \ - sed -r -n 's/^#[[:space:]]*include DEF_MPERS_TYPE\(([^)]+)\)/#ifdef MPERS_$(mpers_PREFIX)\1\n# define \1 MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f || exit; \ + sed -E -n 's/^#[[:space:]]*include DEF_MPERS_TYPE\(([^)]+)\)/#ifdef MPERS_$(mpers_PREFIX)\1\n# define \1 MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f || exit; \ done > $@-t echo '#undef MPERS_PRINTER_NAME' >> $@-t echo '#define MPERS_PRINTER_NAME(printer_name) printer_name' >> $@-t @@ -1178,7 +1178,7 @@ m%_type_defs.h: $(srcdir_mpers_source_files) m%_funcs.h: $(srcdir_mpers_source_files) for f in $^; do \ - sed -r -n 's/^SYS_FUNC\(([^)]+)\)/#undef sys_\1\n#define sys_\1 $(mpers_PREFIX)sys_\1/p' $$f || exit; \ + sed -E -n 's/^SYS_FUNC\(([^)]+)\)/#undef sys_\1\n#define sys_\1 $(mpers_PREFIX)sys_\1/p' $$f || exit; \ done > $@-t && \ echo '#include "sys_func.h"' >> $@-t mv $@-t $@ @@ -1194,7 +1194,7 @@ printers.h: $(mpers_preproc_files) echo '/* Generated by Makefile from $^; do not edit. */' > $@-t echo 'typedef struct {' >> $@-t for f in $^; do \ - sed -r -n 's/$(mpers_printer_decl_pattern)/ \1 (*\2)(\3);\n#define \2 MPERS_PRINTER_NAME(\2)\n/p' $$f \ + sed -E -n 's/$(mpers_printer_decl_pattern)/ \1 (*\2)(\3);\n#define \2 MPERS_PRINTER_NAME(\2)\n/p' $$f \ || exit; \ done >> $@-t echo '} struct_printers;' >> $@-t @@ -1205,7 +1205,7 @@ printers.h: $(mpers_preproc_files) %_printer_decls.h: $(mpers_preproc_files) echo '/* Generated by Makefile from $^; do not edit. */' > $@-t for f in $^; do \ - sed -r -n 's/$(mpers_printer_decl_pattern)/extern \1 $(mpers_PREFIX)\2(\3);/p' $$f \ + sed -E -n 's/$(mpers_printer_decl_pattern)/extern \1 $(mpers_PREFIX)\2(\3);/p' $$f \ || exit; \ done >> $@-t mv $@-t $@ @@ -1213,7 +1213,7 @@ printers.h: $(mpers_preproc_files) %_printer_defs.h: $(mpers_preproc_files) echo '/* Generated by Makefile from $^; do not edit. */' > $@-t for f in $^; do \ - sed -r -n 's/$(mpers_printer_decl_pattern)/.\2 = $(mpers_PREFIX)\2,/p' $$f \ + sed -E -n 's/$(mpers_printer_decl_pattern)/.\2 = $(mpers_PREFIX)\2,/p' $$f \ || exit; \ done >> $@-t mv $@-t $@ diff --git a/src/generate_mpers_am.sh b/src/generate_mpers_am.sh index 56dd9f38e..d7e7a3b57 100755 --- a/src/generate_mpers_am.sh +++ b/src/generate_mpers_am.sh @@ -9,7 +9,7 @@ cd "$(dirname "$0")" -list="$(sed -r -n '/^strace_SOURCES[[:space:]]*=/,/^[[:space:]]*# end of strace_SOURCES/ s/^[[:space:]]*([[:alnum:]][^.]*\.c)[[:space:]]*\\$/\1/p' Makefile.am | +list="$(sed -E -n '/^strace_SOURCES[[:space:]]*=/,/^[[:space:]]*# end of strace_SOURCES/ s/^[[:space:]]*([[:alnum:]][^.]*\.c)[[:space:]]*\\$/\1/p' Makefile.am | xargs -r grep -Elx '#[[:space:]]*include[[:space:]]+MPERS_DEFS' | tr '\n' ' ')" @@ -18,5 +18,5 @@ cat > mpers.am <<EOF mpers_source_files = $list EOF -sed -r -n 's/^#[[:space:]]*include[[:space:]]*"xlat\/([a-z][a-z_0-9]*)\.h".*/extern const struct xlat \1[];/p' \ +sed -E -n 's/^#[[:space:]]*include[[:space:]]*"xlat\/([a-z][a-z_0-9]*)\.h".*/extern const struct xlat \1[];/p' \ $list > mpers_xlat.h diff --git a/src/generate_sen.sh b/src/generate_sen.sh index 343949654..25cde69c4 100755 --- a/src/generate_sen.sh +++ b/src/generate_sen.sh @@ -9,7 +9,7 @@ echo 'enum {' echo 'SEN_printargs = 0,' - sed -r -n '/printargs/! s/.*SEN\(([^)]+)\).*/\1/p' | + sed -E -n '/printargs/! s/.*SEN\(([^)]+)\).*/\1/p' | LC_COLLATE=C sort -u | sed 's/.*/SEN_&,/' echo '};' diff --git a/src/kernel_fcntl.h b/src/kernel_fcntl.h index 497aa4887..9c0e68d96 100644 --- a/src/kernel_fcntl.h +++ b/src/kernel_fcntl.h @@ -19,7 +19,7 @@ # define flock64 kernel_flock64 /* - * sed -rn 's/^#define[[:space:]]+([^[:space:]]+)[[:space:]].*$/# undef \1/p' \ + * sed -En 's/^#define[[:space:]]+([^[:space:]]+)[[:space:]].*$/# undef \1/p' \ * include/uapi/asm-generic/fcntl.h */ # undef O_ACCMODE diff --git a/src/linux/mips/genstub.sh b/src/linux/mips/genstub.sh index 02d1b8d35..4c01c0151 100755 --- a/src/linux/mips/genstub.sh +++ b/src/linux/mips/genstub.sh @@ -11,5 +11,5 @@ dstdir="$1"; shift for n; do in="$srcdir/syscallent-$n.h" out="$dstdir/syscallent-$n-stub.h" - sed -r -n '/^#if/,/^#else/ {s/^([^{]*\{[^,]*,[^,]*,[[:space:]]*)[^,[:space:]]+,[[:space:]]*"([^"]+".*)/\1SEN(printargs), SYSCALL_NAME_PREFIX "\2/; s/^\[.*/&/p}' < "$in" > "$out" + sed -E -n '/^#if/,/^#else/ {s/^([^{]*\{[^,]*,[^,]*,[[:space:]]*)[^,[:space:]]+,[[:space:]]*"([^"]+".*)/\1SEN(printargs), SYSCALL_NAME_PREFIX "\2/; s/^\[.*/&/p}' < "$in" > "$out" done diff --git a/src/mpers.sh b/src/mpers.sh index bb5685465..bb948de8d 100755 --- a/src/mpers.sh +++ b/src/mpers.sh @@ -25,7 +25,7 @@ VAR_NAME='mpers_target_var' BITS_DIR="mpers-${ARCH_FLAG}" mkdir -p ${BITS_DIR} -set -- $(sed -r -n \ +set -- $(sed -E -n \ 's/^#[[:space:]]*include[[:space:]]+DEF_MPERS_TYPE\(([^)[:space:]]*)\)$/\1/p' \ "${PARSER_FILE}") for m_type; do @@ -47,7 +47,7 @@ for m_type; do sed -i -e '/DEF_MPERS_TYPE/d' "${f_c}" $CC $CFLAGS $CC_ARCH_FLAG "${f_c}" -o "${f_o}" $READELF --wide --debug-dump=info "${f_o}" > "${f_d1}" - sed -r -n ' + sed -E -n ' /^[[:space:]]*<1>/,/^[[:space:]]*<1><[^>]+>: Abbrev Number: 0/!d /^[[:space:]]*<[^>]*><[^>]*>: Abbrev Number: 0/d s/^[[:space:]]*<[[:xdigit:]]+>[[:space:]]+// diff --git a/src/xlat/v4l2_meta_fmts.in b/src/xlat/v4l2_meta_fmts.in index 19c865965..3603fd80e 100644 --- a/src/xlat/v4l2_meta_fmts.in +++ b/src/xlat/v4l2_meta_fmts.in @@ -1,5 +1,5 @@ #unconditional -#sorted sed -rn 's/.*v4l2_fourcc(_be)?\('"'(.)', '(.)', '(.)', '(.)'"'\).*/\10\5\4\3\2\t\0/p' |LC_COLLATE=C sort -k1,1 -t' ' |cut -f2- +#sorted sed -En 's/.*v4l2_fourcc(_be)?\('"'(.)', '(.)', '(.)', '(.)'"'\).*/\10\5\4\3\2\t\0/p' |LC_COLLATE=C sort -k1,1 -t' ' |cut -f2- V4L2_META_FMT_VIVID V4L2_META_FMT_UVC V4L2_META_FMT_VSP1_HGO diff --git a/src/xlat/v4l2_pix_fmts.in b/src/xlat/v4l2_pix_fmts.in index d793c099a..c14d728fa 100644 --- a/src/xlat/v4l2_pix_fmts.in +++ b/src/xlat/v4l2_pix_fmts.in @@ -1,5 +1,5 @@ #unconditional -#sorted sed -rn 's/.*v4l2_fourcc(_be)?\('"'(.)', '(.)', '(.)', '(.)'"'\).*/\10\5\4\3\2\t\0/p' |LC_COLLATE=C sort -k1,1 -t' ' |cut -f2- +#sorted sed -En 's/.*v4l2_fourcc(_be)?\('"'(.)', '(.)', '(.)', '(.)'"'\).*/\10\5\4\3\2\t\0/p' |LC_COLLATE=C sort -k1,1 -t' ' |cut -f2- V4L2_PIX_FMT_Y10 V4L2_PIX_FMT_Y12 V4L2_PIX_FMT_Y4 diff --git a/src/xlat/v4l2_sdr_fmts.in b/src/xlat/v4l2_sdr_fmts.in index d62238d79..45e9b7d35 100644 --- a/src/xlat/v4l2_sdr_fmts.in +++ b/src/xlat/v4l2_sdr_fmts.in @@ -1,5 +1,5 @@ #unconditional -#sorted sed -rn 's/.*v4l2_fourcc(_be)?\('"'(.)', '(.)', '(.)', '(.)'"'\).*/\10\5\4\3\2\t\0/p' |LC_COLLATE=C sort -k1,1 -t' ' |cut -f2- +#sorted sed -En 's/.*v4l2_fourcc(_be)?\('"'(.)', '(.)', '(.)', '(.)'"'\).*/\10\5\4\3\2\t\0/p' |LC_COLLATE=C sort -k1,1 -t' ' |cut -f2- V4L2_SDR_FMT_PCU20BE V4L2_SDR_FMT_RU12LE V4L2_SDR_FMT_CS14LE diff --git a/tests/Makefile.am b/tests/Makefile.am index 577d4c637..e10c34adb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -800,7 +800,7 @@ EXTRA_DIST = \ ksysent.h: $(srcdir)/ksysent.sed echo '#include <asm/unistd.h>' | \ $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM - > $@.t1 - LC_COLLATE=C sed -r -n -f $(srcdir)/ksysent.sed < $@.t1 > $@.t2 + LC_COLLATE=C sed -E -n -f $(srcdir)/ksysent.sed < $@.t1 > $@.t2 mv -f $@.t2 $@ rm -f $@.t1 diff --git a/tests/gen_secontext.sh b/tests/gen_secontext.sh index 93f8a20a1..f02c992a1 100755 --- a/tests/gen_secontext.sh +++ b/tests/gen_secontext.sh @@ -30,15 +30,15 @@ dir="$(dirname "$input")" secontext_EXECUTABLES = \\ EOF - sed -r -n 's/^([^#[:space:]]+--secontext(_full)?(_mismatch)?)[[:space:]].*/ \1 \\/p' < "$input" + sed -E -n 's/^([^#[:space:]]+--secontext(_full)?(_mismatch)?)[[:space:]].*/ \1 \\/p' < "$input" cat <<EOF # EOF - sed -r -n 's/-/_/g; s/^([^#[:space:]]+__secontext(_full)?(_mismatch)?)[[:space:]].*/\1_LDADD = \$(LDADD) \$(libselinux_LDADD)/p' < "$input" + sed -E -n 's/-/_/g; s/^([^#[:space:]]+__secontext(_full)?(_mismatch)?)[[:space:]].*/\1_LDADD = \$(LDADD) \$(libselinux_LDADD)/p' < "$input" } > "$dir/secontext.am" -sed -r -n 's/^([^#[:space:]]+--secontext)[[:space:]].*/\1/p' < "$input" | +sed -E -n 's/^([^#[:space:]]+--secontext)[[:space:]].*/\1/p' < "$input" | while read -r name; do { cat <<-EOF > "$dir/$name.c" /* @@ -63,7 +63,7 @@ while read -r name; do { EOF } < /dev/null; done -sed -r -n 's/^([^#[:space:]]+--secontext_full)[[:space:]].*/\1/p' < "$input" | +sed -E -n 's/^([^#[:space:]]+--secontext_full)[[:space:]].*/\1/p' < "$input" | while read -r name; do { cat <<-EOF > "$dir/$name.c" #define PRINT_SECONTEXT_FULL @@ -71,7 +71,7 @@ while read -r name; do { EOF } < /dev/null; done -sed -r -n 's/^([^#[:space:]]+--secontext(_full)?_mismatch)[[:space:]].*/\1/p' < "$input" | +sed -E -n 's/^([^#[:space:]]+--secontext(_full)?_mismatch)[[:space:]].*/\1/p' < "$input" | while read -r name; do { cat <<-EOF > "$dir/$name.c" #define PRINT_SECONTEXT_MISMATCH diff --git a/tests/init.sh b/tests/init.sh index ecc9a9ba8..b1a9aeb61 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -38,7 +38,7 @@ sed_slash_escape() # in the CONFIG_H variable). get_config_str() { - sed -r -n 's/#define[[:space:]]*'"$1"'[[:space:]]*"([^"]*)".*/\1/p' \ + sed -E -n 's/#define[[:space:]]*'"$1"'[[:space:]]*"([^"]*)".*/\1/p' \ "$CONFIG_H" } @@ -50,7 +50,7 @@ get_config_str() get_config_option() { local opt - opt=$(sed -r -n 's/#define[[:space:]]*'"$1"'[[:space:]]*([0-9]+)$/\1/p' \ + opt=$(sed -E -n 's/#define[[:space:]]*'"$1"'[[:space:]]*([0-9]+)$/\1/p' \ "$CONFIG_H") if [ -n "$opt" -a "$opt" -ne 0 ]; then printf "%s" "$2" diff --git a/tests/ksysent.sed b/tests/ksysent.sed index 92069e756..a24be53f6 100644 --- a/tests/ksysent.sed +++ b/tests/ksysent.sed @@ -1,4 +1,4 @@ -#!/bin/sed -rnf +#!/bin/sed -Enf # # Copyright (c) 2015-2019 The strace developers. # All rights reserved. diff --git a/tests/pc.test b/tests/pc.test index b70669eab..553fd9150 100755 --- a/tests/pc.test +++ b/tests/pc.test @@ -18,14 +18,14 @@ args="--quiet=attach,personality -if $args" $STRACE $args 2> "$LOG" || dump_log_and_fail_with "$STRACE $args failed" -len="$(sed -r -n 's/^\[[[:xdigit:]]+\] write\(-1, 0x8, ([[:digit:]]{1,2})\)[[:space:]]+= -1 .*/\1/p' "$LOG")" && +len="$(sed -E -n 's/^\[[[:xdigit:]]+\] write\(-1, 0x8, ([[:digit:]]{1,2})\)[[:space:]]+= -1 .*/\1/p' "$LOG")" && [ -n "$len" ] && -pid="$(sed -r -n 's/^\[[[:xdigit:]]{'"$len"'}\] --- SIGCHLD \{si_signo=SIGCHLD, si_code=CLD_(KILLED|DUMPED), si_pid=([[:digit:]]+), .*/\2/p' "$LOG")" && +pid="$(sed -E -n 's/^\[[[:xdigit:]]{'"$len"'}\] --- SIGCHLD \{si_signo=SIGCHLD, si_code=CLD_(KILLED|DUMPED), si_pid=([[:digit:]]+), .*/\2/p' "$LOG")" && [ -n "$pid" ] && -ip="$(sed -r -n 's/^\[pid +'"$pid"'\] \[([[:xdigit:]]{'"$len"'})] --- SIGSEGV \{.*\} ---$/\1/p' "$LOG")" && +ip="$(sed -E -n 's/^\[pid +'"$pid"'\] \[([[:xdigit:]]{'"$len"'})] --- SIGSEGV \{.*\} ---$/\1/p' "$LOG")" && [ -n "$ip" ] && # strip the last nibble of the address. On hppa the lowest 2 bits encode the address space. -addr="$(echo "$ip" |sed -r 's/^0+//')" && addr=${addr%?} && +addr="$(echo "$ip" |sed -E 's/^0+//')" && addr=${addr%?} && [ -n "$addr" ] || dump_log_and_fail_with diff --git a/tests/strace-S.test b/tests/strace-S.test index fcea4185e..d64d6bf5c 100755 --- a/tests/strace-S.test +++ b/tests/strace-S.test @@ -19,7 +19,7 @@ test_c() sedexpr="$1"; shift run_strace -c -w $sortby ../readv > /dev/null - sed -r -n -e "$sedexpr" < "$LOG" > "$OUT" + sed -E -n -e "$sedexpr" < "$LOG" > "$OUT" [ -s "$OUT" ] || fail_ "$STRACE $args output mismatch" |