From d6ff771c82ca97d80e630454e80573a6b716372b Mon Sep 17 00:00:00 2001
From: Thibault Charbonnier <thibaultcha@me.com>
Date: Tue, 24 Sep 2019 12:50:53 -0700
Subject: [PATCH] tests: sanity.t: fixed (again) test cases failing due to the
 last few commits.

This failure was first fixed in
1f3cf84a8a20811bc1f39242289b3caed849b2e4, but mistakenly reverted in
395bed2b14fe9add4f2ce396548ea3ed6d04c386, causing Travis-CI to fail on
this test again.

It was then reverted again in 41abd0f3b570177b5b3bb36d75846aa6e1e78cc5,
and now fixed one more time.
---
 t/000-sanity.t | 58 +++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/t/000-sanity.t b/t/000-sanity.t
index 91998a9..2d1929e 100644
--- a/t/000-sanity.t
+++ b/t/000-sanity.t
@@ -1806,43 +1806,43 @@ clean:
 
 === TEST 22: ngx_postgres enabled and --with-pg_config is specified
 --- cmd: ./configure --with-pg_config=pg_config --with-http_postgres_module --dry-run
---- out
-platform: linux (linux)
+--- out_like
+platform: linux \(linux\)
 cp -rp bundle/ build
 cd build
-export LIBPQ_LIB='/usr/lib64'
-export LIBPQ_INC='/usr/include'
+export LIBPQ_LIB='(/usr/lib64|/usr/lib/x86_64-linux-gnu)'
+export LIBPQ_INC='(?:/usr/include|/usr/include/postgresql)'
 cd LuaJIT-2.1-20200102
 INFO: found -msse4.2 in cc.
 gmake TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit
-gmake install TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root/
-export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
-export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1'
+gmake install TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit DESTDIR=\$OPENRESTY_BUILD_DIR/luajit-root/
+export LUAJIT_LIB='\$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
+export LUAJIT_INC='\$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1'
 cd ..
 patching the resty script with hard-coded nginx binary path...
 cd nginx-1.17.4
-sh ./configure --prefix=/usr/local/openresty/nginx \
-  --with-cc-opt='-O2' \
-  --add-module=../ngx_devel_kit-0.3.1rc1 \
-  --add-module=../echo-nginx-module-0.62rc1 \
-  --add-module=../xss-nginx-module-0.06 \
-  --add-module=../ngx_coolkit-0.2 \
-  --add-module=../set-misc-nginx-module-0.32 \
-  --add-module=../form-input-nginx-module-0.12 \
-  --add-module=../encrypted-session-nginx-module-0.08 \
-  --add-module=../ngx_postgres-1.0 \
-  --add-module=../srcache-nginx-module-0.32rc1 \
-  --add-module=../ngx_lua-0.10.15 \
-  --add-module=../ngx_lua_upstream-0.07 \
-  --add-module=../headers-more-nginx-module-0.33 \
-  --add-module=../array-var-nginx-module-0.05 \
-  --add-module=../memc-nginx-module-0.19 \
-  --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
-  --add-module=../rds-json-nginx-module-0.15 \
-  --add-module=../rds-csv-nginx-module-0.09 \
-  --add-module=../ngx_stream_lua-0.0.7 \
-  --with-ld-opt='-Wl,-rpath,/usr/lib64:/usr/local/openresty/luajit/lib' \
+sh ./configure --prefix=/usr/local/openresty/nginx \\
+  --with-cc-opt='-O2' \\
+  --add-module=../ngx_devel_kit-0.3.1rc1 \\
+  --add-module=../echo-nginx-module-0.62rc1 \\
+  --add-module=../xss-nginx-module-0.06 \\
+  --add-module=../ngx_coolkit-0.2 \\
+  --add-module=../set-misc-nginx-module-0.32 \\
+  --add-module=../form-input-nginx-module-0.12 \\
+  --add-module=../encrypted-session-nginx-module-0.08 \\
+  --add-module=../ngx_postgres-1.0 \\
+  --add-module=../srcache-nginx-module-0.32rc1 \\
+  --add-module=../ngx_lua-0.10.15 \\
+  --add-module=../ngx_lua_upstream-0.07 \\
+  --add-module=../headers-more-nginx-module-0.33 \\
+  --add-module=../array-var-nginx-module-0.05 \\
+  --add-module=../memc-nginx-module-0.19 \\
+  --add-module=../redis2-nginx-module-0.15 \\
+  --add-module=../redis-nginx-module-0.3.7 \\
+  --add-module=../rds-json-nginx-module-0.15 \\
+  --add-module=../rds-csv-nginx-module-0.09 \\
+  --add-module=../ngx_stream_lua-0.0.7 \\
+  --with-ld-opt='-Wl,-rpath,\1:/usr/local/openresty/luajit/lib' \\
   --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module
 cd ../..
 Type the following commands to build and install: