From 119e968305083a4bc0943a74745fd38240979f70 Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Wed, 3 Mar 2004 04:22:47 +0000 Subject: [PATCH] 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 --- src/test/regress/GNUmakefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 4a3942bc383..61a2f9f790a 100644 --- 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' \ -- GitLab