Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 119e968

Browse files
committed
Adds the -W flag to the pwd call under Win32. This allows directories,
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 (> 20) tests under Win32. Claudio Natoli
1 parent 0ee2603 commit 119e968

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/test/regress/GNUmakefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# 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 $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -73,8 +73,14 @@ output_files := $(foreach file, $(file_list), expected/$(file).out)
7373

7474
all: $(input_files) $(output_files)
7575

76+
ifneq ($(PORTNAME),win32)
7677
abs_srcdir := $(shell cd $(srcdir) && pwd)
7778
abs_builddir := $(shell pwd)
79+
else
80+
abs_srcdir := $(shell cd $(srcdir) && pwd -W)
81+
abs_builddir := $(shell pwd -W)
82+
endif
83+
7884

7985
define sed-command
8086
sed -e 's,@abs_srcdir@,$(abs_srcdir),g' \

0 commit comments

Comments
 (0)