Commit Diff

Commit:
6d5b325d9740b5ea90167a5e47ecba3ff3777d2f
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
portable: regress: remove sed wrapper Now that the use of sed(1) in tests has been replaced with ed(1), the sed wrapper can be retired. There are existing tests which use sed, but they're modifying a stream, rather than using -i, so there's no portability concerns.
Actions:
Patch | Tree
commit - ac3cdf31e06d51b4966449da12216d3614e10576
commit + 6d5b325d9740b5ea90167a5e47ecba3ff3777d2f
blob - 745539b43da693829d69925c94761edf2731751d
blob + 7e0eedeb0291727fa2b2651ff4c8911df3aaf27b
--- regress/cmdline/common.sh
+++ regress/cmdline/common.sh
@@ -32,14 +32,6 @@ export LC_ALL=C
 
 export MALLOC_OPTIONS=S
 
-# Check to see if PLATFORM has a value.  PLATFORM is populated when running
-# via `./configure && make` but this isn't guaranteed if an individual test is
-# run directly, such as `regress/cmdline/tag.sh`.  In such cases, PLATFORM
-# will be empty, but we still want to use it.  Since we test for non-linux
-# values, only set PLATFORM if we're running on Linu so that the correct
-# commands are used.
-[ -z "$PLATFORM" -a "$(uname)" = "Linux" ] && PLATFORM="linux"
-
 if [ "$(date -u -r 86400 +%F 2>/dev/null)" != 1970-01-02 ]; then
 	DATECMD=
 	for p in date gdate; do
@@ -68,39 +60,6 @@ if [ "$(date -u -r 86400 +%F 2>/dev/null)" != 1970-01-
 	}
 fi
 
-sed()
-{
-	SEDCMD="sed"
-
-	# On non-linux systems, the sed command can happily accept "-i ''" as
-	# a valid command to not save backup files for in-place edits.
-	# However, on linux, "-i ''" would be treated as "-i" with a blank
-	# argument, and hence, no file to edit in-place, which is an error.
-	#
-	# Therefore, scan the argument list and remove "-i ''", replacing it
-	# with just "-i".
-
-	[ "$PLATFORM" = "linux" ] && {
-		for w in "$@"
-		do
-			[ "$w" = "-i" ] && {
-				seen=1
-				continue
-			}
-
-			[ "$seen" = "1" -a -z "$w" ] && {
-				# Move past -i and ''
-				shift 2
-
-				command "$SEDCMD" -i "$@"
-				return
-			}
-		done
-	}
-	command "$SEDCMD" "$@"
-}
-
-
 git_init()
 {
 	git init -q "$1"