tests: updated tests to reflect recent changes.

t/000-sanity.t

@@ -1411,8 +1411,8 @@ install: all
 clean:
 	rm -rf build *.exe *.dll openresty-*
 --- err
-Can't exec "gcc-4.2": No such file or directory at ./configure line 725.
-Can't exec "gcc-4.2": No such file or directory at ./configure line 770.
+Can't exec "gcc-4.2": No such file or directory at ./configure line 719.
+Can't exec "gcc-4.2": No such file or directory at ./configure line 764.
 
 
 
@@ -1592,8 +1592,8 @@ install: all
 clean:
 	rm -rf build *.exe *.dll openresty-*
 --- err
-Can't exec "cl": No such file or directory at ./configure line 725.
-Can't exec "cl": No such file or directory at ./configure line 770.
+Can't exec "cl": No such file or directory at ./configure line 719.
+Can't exec "cl": No such file or directory at ./configure line 764.
 
 
 
@@ -1810,43 +1810,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_like
-platform: linux \(linux\)
+--- out
+platform: linux (linux)
 cp -rp bundle/ build
 cd build
-export LIBPQ_LIB='(/usr/lib64|/usr/lib/x86_64-linux-gnu)'
-export LIBPQ_INC='(?:/usr/include|/usr/include/postgresql)'
+export LIBPQ_LIB='/usr/lib64'
+export LIBPQ_INC='/usr/include'
 cd LuaJIT-2.1-20200102
 INFO: found -msse4.2 in cc.
 gmake TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit
-gmake install TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -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 -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.8
-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.16rc5 \\
-  --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.8rc3 \\
-  --with-ld-opt='-Wl,-rpath,\1:/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.16rc5 \
+  --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.8rc3 \
+  --with-ld-opt='-Wl,-rpath,/usr/lib64:/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:
@@ -2436,8 +2436,8 @@ install: all
 clean:
 	rm -rf build *.exe *.dll openresty-*
 --- err
-Can't exec "sw_vers": No such file or directory at ./configure line 844.
-Use of uninitialized value $v in scalar chomp at ./configure line 845.
+Can't exec "sw_vers": No such file or directory at ./configure line 838.
+Use of uninitialized value $v in scalar chomp at ./configure line 839.
 
 
 
@@ -2527,8 +2527,8 @@ install: all
 clean:
 	rm -rf build *.exe *.dll openresty-*
 --- err
-Can't exec "sw_vers": No such file or directory at ./configure line 844.
-Use of uninitialized value $v in scalar chomp at ./configure line 845.
+Can't exec "sw_vers": No such file or directory at ./configure line 838.
+Use of uninitialized value $v in scalar chomp at ./configure line 839.
 
 
 
@@ -5876,3 +5876,4 @@ install: all
 
 clean:
 	rm -rf build *.exe *.dll openresty-*
+