Adds the -W flag to the pwd call under Win32. This allows directories,

bmomjian · bmomjian · commit 119e96830508 · 2004-03-03T04:22:47.000Z
which are munged by sed, such as:
/e/cygwin/opt/diff9c/pgsql/src/test/regress/data/agg.data to be
correctly passed as:
e:/cygwin/opt/diff9c/pgsql/src/test/regress/data/agg.data

FWIW, "fixes" a large (&gt; 20) tests under Win32.

Claudio Natoli
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.45 2003/12/23 21:56:21 tgl Exp $
+#    $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.46 2004/03/03 04:22:47 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -73,8 +73,14 @@ output_files := $(foreach file, $(file_list), expected/$(file).out)
 
 all: $(input_files) $(output_files)
 
+ifneq ($(PORTNAME),win32)
 abs_srcdir := $(shell cd $(srcdir) && pwd)
 abs_builddir := $(shell pwd)
+else
+abs_srcdir := $(shell cd $(srcdir) && pwd -W)
+abs_builddir := $(shell pwd -W)
+endif
+
 
 define sed-command
 sed -e 's,@abs_srcdir@,$(abs_srcdir),g' \

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.45 2003/12/23 21:56:21 tgl Exp $`
	`10`	`+# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.46 2004/03/03 04:22:47 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -73,8 +73,14 @@ output_files := $(foreach file, $(file_list), expected/$(file).out)`
`73`	`73`
`74`	`74`	`all: $(input_files) $(output_files)`
`75`	`75`
	`76`	`+ifneq ($(PORTNAME),win32)`
`76`	`77`	`abs_srcdir := $(shell cd $(srcdir) && pwd)`
`77`	`78`	`abs_builddir := $(shell pwd)`
	`79`	`+else`
	`80`	`+abs_srcdir := $(shell cd $(srcdir) && pwd -W)`
	`81`	`+abs_builddir := $(shell pwd -W)`
	`82`	`+endif`
	`83`	`+`
`78`	`84`
`79`	`85`	`define sed-command`
`80`	`86`	`sed -e 's,@abs_srcdir@,$(abs_srcdir),g' \`