tests: removed resty-cli from the test dependencies.

Signed-off-by: Thibault Charbonnier <thibaultcha@me.com>

Author: spacewander

.travis.yml

@@ -59,7 +59,6 @@ install:
   - if [ ! -f download-cache/pcre-$PCRE_VER.tar.gz ]; then wget -P download-cache http://ftp.cs.stanford.edu/pub/exim/pcre/pcre-$PCRE_VER.tar.gz; fi
   - git clone https://github.com/openresty/openresty.git ../openresty
   - git clone https://github.com/openresty/openresty-devel-utils.git
-  - git clone https://github.com/openresty/resty-cli.git ../resty-cli
   - git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
   - git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
   - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
@@ -98,13 +97,12 @@ script:
   - export PATH=$PWD/apps:$PATH
   - openssl version
   - cd ..
-  - export PATH=$PWD/work/nginx/sbin:$PWD/openresty-devel-utils:$PWD/../resty-cli/bin:$PATH
+  - export PATH=$PWD/work/nginx/sbin:$PWD/openresty-devel-utils:$PATH
   - export LD_PRELOAD=$PWD/mockeagain/mockeagain.so
   - export LD_LIBRARY_PATH=$PWD/mockeagain:$LD_LIBRARY_PATH
   - export TEST_NGINX_RESOLVER=8.8.4.4
   - export NGX_BUILD_CC=$CC
   - ngx-build $NGINX_VERSION --with-ipv6 --with-http_realip_module --with-http_ssl_module --with-pcre-jit --with-cc-opt="-I$OPENSSL_INC -I$PCRE_INC" --with-ld-opt="-L$OPENSSL_LIB -Wl,-rpath,$OPENSSL_LIB -L$PCRE_LIB -Wl,-rpath,$PCRE_LIB" --add-module=../ndk-nginx-module --add-module=../echo-nginx-module --add-module=../set-misc-nginx-module --add-module=../headers-more-nginx-module --add-module=../lua-nginx-module --with-debug --with-stream_ssl_module --with-stream --with-ipv6 --add-module=../stream-lua-nginx-module > build.log 2>&1 || (cat build.log && exit 1)
   - nginx -V
   - ldd `which nginx`|grep -E 'luajit|ssl|pcre'
-  - resty -V
   - prove -Itest-nginx/lib -j$JOBS -r t

t/pipe.t

@@ -32,7 +32,7 @@ _EOC_
 });
 
 $ENV{TEST_NGINX_HTML_DIR} ||= html_dir();
-$ENV{TEST_NGINX_LIB_DIR} ||= $t::TestCore::pwd;
+$ENV{TEST_NGINX_LUA_PACKAGE_PATH} = "$t::TestCore::lua_package_path";
 
 env_to_nginx("PATH");
 no_long_string();
@@ -1358,11 +1358,17 @@ lua pipe kill process:
 --- config
     location = /t {
         content_by_lua_block {
+            local function get_ngx_bin_path()
+                local ffi = require "ffi"
+                ffi.cdef[[char **ngx_argv;]]
+                return ffi.string(ffi.C.ngx_argv[0])
+            end
+
+            local conf_file = "$TEST_NGINX_HTML_DIR/nginx.conf"
+            local nginx = get_ngx_bin_path()
+
+            local cmd = nginx .. " -p $TEST_NGINX_HTML_DIR -c " .. conf_file
             local ngx_pipe = require "ngx.pipe"
-            local cmd = [[resty -I $TEST_NGINX_LIB_DIR/lib]]
-                .. [[ --nginx `which nginx`]]
-                .. [[ -e 'print(require "ngx.pipe".spawn{"no-such-cmd"}]]
-                .. [[:wait())']]
             local proc, err = ngx_pipe.spawn(cmd)
             if not proc then
                 ngx.log(ngx.ERR, err)
@@ -1378,6 +1384,25 @@ lua pipe kill process:
             ngx.say(data)
         }
     }
+--- user_files
+>>> nginx.conf
+events {
+    worker_connections 64;
+}
+error_log stderr error;
+daemon off;
+master_process off;
+worker_processes 1;
+http {
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
+    init_worker_by_lua_block {
+        ngx.timer.at(0, function()
+            require "ngx.pipe".spawn{"no-such-cmd"}:wait()
+            os.exit(0)
+        end)
+    }
+}
+>>> logs/error.log
 --- response_body_like
 lua pipe child execvp\(\) failed while executing no-such-cmd \(2: No such file or directory\)