Changeset: 22a08e186948 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22a08e186948
Modified Files:
NT/installer32/cv64-32.sh
NT/installer64/cv32-64.sh
sql/test/pg_regress/Tests/load.SQL.sh
sql/test/pg_regress/postgresql2sql99.sh
testing/quicktest
Branch: Jan2014
Log Message:
Portability issues for sed command.
Some sed implementations require a suffix for the -i command, so
always provide one (and not as a separate argument!); some sed
implementations only recognize I (and not i) as a flag for the s
(substitute) command, so use that.
diffs (141 lines):
diff --git a/NT/installer32/cv64-32.sh b/NT/installer32/cv64-32.sh
--- a/NT/installer32/cv64-32.sh
+++ b/NT/installer32/cv64-32.sh
@@ -19,13 +19,13 @@
# this script is mostly to document what I did, not for regular use.
cp ../installer64/*.{vdproj,sln} .
-sed -i -e '/TargetPlatform/s/3:1/3:0/' \
- -e 's/win64/win32/' \
- -e 's/\[ProgramFiles64Folder\]/[ProgramFilesFolder]/' \
- -e 's/C:\\\\Program Files.*\\\\Common Files\\\\Merge
Modules\\\\Microsoft_VC100_CRT_x64.msm/C:\\\\Program Files\\\\Common
Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x86.msm/' \
- -e 's/"ProductCode" = "8:{.*/"ProductCode" =
"8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"/' \
- -e 's/"PackageCode" = "8:{.*/"PackageCode" =
"8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"/' \
- -e 's/"UpgradeCode" =
"8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"/"UpgradeCode" =
"8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"/' \
- -e 's/"UpgradeCode" =
"8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"/"UpgradeCode" =
"8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"/' \
- -e 's/"UpgradeCode" =
"8:{839D3C90-B578-41E2-A004-431440F9E899}"/"UpgradeCode" =
"8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"/' \
+sed -i~ -e '/TargetPlatform/s/3:1/3:0/' \
+ -e 's/win64/win32/' \
+ -e 's/\[ProgramFiles64Folder\]/[ProgramFilesFolder]/' \
+ -e 's/C:\\\\Program Files.*\\\\Common Files\\\\Merge
Modules\\\\Microsoft_VC100_CRT_x64.msm/C:\\\\Program Files\\\\Common
Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x86.msm/' \
+ -e 's/"ProductCode" = "8:{.*/"ProductCode" =
"8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"/' \
+ -e 's/"PackageCode" = "8:{.*/"PackageCode" =
"8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"/' \
+ -e 's/"UpgradeCode" =
"8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"/"UpgradeCode" =
"8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"/' \
+ -e 's/"UpgradeCode" =
"8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"/"UpgradeCode" =
"8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"/' \
+ -e 's/"UpgradeCode" =
"8:{839D3C90-B578-41E2-A004-431440F9E899}"/"UpgradeCode" =
"8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"/' \
*.vdproj
diff --git a/NT/installer64/cv32-64.sh b/NT/installer64/cv32-64.sh
--- a/NT/installer64/cv32-64.sh
+++ b/NT/installer64/cv32-64.sh
@@ -19,13 +19,13 @@
# this script is mostly to document what I did, not for regular use.
cp ../installer32/*.{vdproj,sln} .
-sed -i -e '/TargetPlatform/s/3:0/3:1/' \
- -e 's/win32/win64/' \
- -e 's/\[ProgramFilesFolder\]/[ProgramFiles64Folder]/' \
- -e 's/C:\\\\Program Files.*\\\\Common Files\\\\Merge
Modules\\\\Microsoft_VC100_CRT_x86.msm/C:\\\\Program Files\\\\Common
Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x86_x64.msm/' \
- -e 's/"ProductCode" = "8:{.*/"ProductCode" =
"8:{ACC32EDD-13CE-4079-A6E7-D9DD94DA42EE}"/' \
- -e 's/"PackageCode" = "8:{.*/"PackageCode" =
"8:{332EB6D8-73DD-48CA-83E7-BB1922FFE3BD}"/' \
- -e 's/"UpgradeCode" =
"8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"/"UpgradeCode" =
"8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"/' \
- -e 's/"UpgradeCode" =
"8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"/"UpgradeCode" =
"8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"/' \
- -e 's/"UpgradeCode" =
"8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"/"UpgradeCode" =
"8:{839D3C90-B578-41E2-A004-431440F9E899}"/' \
+sed -i~ -e '/TargetPlatform/s/3:0/3:1/' \
+ -e 's/win32/win64/' \
+ -e 's/\[ProgramFilesFolder\]/[ProgramFiles64Folder]/' \
+ -e 's/C:\\\\Program Files.*\\\\Common Files\\\\Merge
Modules\\\\Microsoft_VC100_CRT_x86.msm/C:\\\\Program Files\\\\Common
Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x86_x64.msm/' \
+ -e 's/"ProductCode" = "8:{.*/"ProductCode" =
"8:{ACC32EDD-13CE-4079-A6E7-D9DD94DA42EE}"/' \
+ -e 's/"PackageCode" = "8:{.*/"PackageCode" =
"8:{332EB6D8-73DD-48CA-83E7-BB1922FFE3BD}"/' \
+ -e 's/"UpgradeCode" =
"8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"/"UpgradeCode" =
"8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"/' \
+ -e 's/"UpgradeCode" =
"8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"/"UpgradeCode" =
"8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"/' \
+ -e 's/"UpgradeCode" =
"8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"/"UpgradeCode" =
"8:{839D3C90-B578-41E2-A004-431440F9E899}"/' \
*.vdproj
diff --git a/sql/test/pg_regress/Tests/load.SQL.sh
b/sql/test/pg_regress/Tests/load.SQL.sh
--- a/sql/test/pg_regress/Tests/load.SQL.sh
+++ b/sql/test/pg_regress/Tests/load.SQL.sh
@@ -7,10 +7,10 @@ Mlog "loading data with sed-foo"
# don't load stud_emp, as it's the only data file with \N entries
# (PostgreSQL NULL notation)
sed -r \
- -e s+@abs_srcdir@+$TSTSRCBASE/$TSTDIR+ig \
+ -e s+@abs_srcdir@+$TSTSRCBASE/$TSTDIR+Ig \
-e '/@abs_builddir@/d' \
-e '/DELETE FROM/d' \
- -e "s/COPY (.*);/COPY INTO \1 USING DELIMITERS '\\\\t\', '\\\\n';/i" \
+ -e "s/COPY (.*);/COPY INTO \1 USING DELIMITERS '\\\\t\', '\\\\n';/I" \
-e '/stud_emp/d' \
$TSTSRCDIR/../input/copy.source \
| $SQL_CLIENT
diff --git a/sql/test/pg_regress/postgresql2sql99.sh
b/sql/test/pg_regress/postgresql2sql99.sh
--- a/sql/test/pg_regress/postgresql2sql99.sh
+++ b/sql/test/pg_regress/postgresql2sql99.sh
@@ -20,26 +20,26 @@
# converts PostgreSQL specific SQL into SQL99 equivalent (if possible)
sed -r \
- -e 's/\bint8\b/bigint/ig' \
- -e 's/\bint4\b/integer/ig' \
- -e 's/\bint2\b/smallint/ig' \
- -e 's/\bfloat4\b/float/ig' \
- -e 's/\bfloat8\b/double/ig' \
- -e 's/\bpath\b/string/ig' \
- -e 's/\bpoint\b/string/ig' \
- -e 's/\bbox\b/string/ig' \
- -e 's/\bpolygon\b/string/ig' \
- -e 's/\bcity_budget\b/decimal(7,2)/ig' \
- -e 's/\bname,/string,/ig' \
- -e 's/\bname$/string/ig' \
- -e 's/(.*)\bFROM ONLY (.*)/\1 FROM \2/ig' \
- -e 's/BEGIN;/START TRANSACTION;/ig' \
- -e 's/END;/COMMIT;/ig' \
- -e 's/COMMENT.*;//ig' \
+ -e 's/\bint8\b/bigint/Ig' \
+ -e 's/\bint4\b/integer/Ig' \
+ -e 's/\bint2\b/smallint/Ig' \
+ -e 's/\bfloat4\b/float/Ig' \
+ -e 's/\bfloat8\b/double/Ig' \
+ -e 's/\bpath\b/string/Ig' \
+ -e 's/\bpoint\b/string/Ig' \
+ -e 's/\bbox\b/string/Ig' \
+ -e 's/\bpolygon\b/string/Ig' \
+ -e 's/\bcity_budget\b/decimal(7,2)/Ig' \
+ -e 's/\bname,/string,/Ig' \
+ -e 's/\bname$/string/Ig' \
+ -e 's/(.*)\bFROM ONLY (.*)/\1 FROM \2/Ig' \
+ -e 's/BEGIN;/START TRANSACTION;/Ig' \
+ -e 's/END;/COMMIT;/Ig' \
+ -e 's/COMMENT.*;//Ig' \
-e '/CREATE TABLE.*INHERITS.*;/s/INHERITS (.*)//' \
- -e 's/\) INHERITS.*;/\);/ig' \
- -e 's/\s+([^\s]+)::float[248]\b/ cast(\1 as double)/ig' \
- -e 's/\s+([^\s]+)::int2\b/ cast(\1 as smallint)/ig' \
- -e 's/\s+([^\s]+)::int4\b/ cast(\1 as integer)/ig' \
- -e 's/\s+([^\s]+)::int8\b/ cast(\1 as bigint)/ig' \
- -e 's/\s+([^\s]+)::(\w+(\([0-9]+(,[0-9]+))\)?)\b/ cast(\1 as \2)/ig'
+ -e 's/\) INHERITS.*;/\);/Ig' \
+ -e 's/\s+([^\s]+)::float[248]\b/ cast(\1 as double)/Ig' \
+ -e 's/\s+([^\s]+)::int2\b/ cast(\1 as smallint)/Ig' \
+ -e 's/\s+([^\s]+)::int4\b/ cast(\1 as integer)/Ig' \
+ -e 's/\s+([^\s]+)::int8\b/ cast(\1 as bigint)/Ig' \
+ -e 's/\s+([^\s]+)::(\w+(\([0-9]+(,[0-9]+))\)?)\b/ cast(\1 as \2)/Ig'
diff --git a/testing/quicktest b/testing/quicktest
--- a/testing/quicktest
+++ b/testing/quicktest
@@ -404,7 +404,7 @@ diff_result_test() {
> "${tstrpath}".stdout.diff
if [[ $? != 0 ]] ; then
# purely estethic
- sed -i \
+ sed -i~ \
-e "/^---
/s:${tstspath}\.stable\.out:${tstn}.stable.out:" \
-e "/^+++ /s:${tstrpath}\.stdout:${tstn}.test.out:" \
"${tstrpath}".stdout.diff
@@ -415,7 +415,7 @@ diff_result_test() {
> "${tstrpath}".stderr.diff
if [[ $? != 0 ]] ; then
# purely estethic
- sed -i \
+ sed -i~ \
-e "/^---
/s:${tstspath}\.stable\.err:${tstn}.stable.err:" \
-e "/^+++ /s:${tstrpath}\.stderr:${tstn}.test.err:" \
"${tstrpath}".stderr.diff
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
