[apisix] branch master updated: test: fix way to check file installation (#6211)

[bzp2010]

This is an automated email from the ASF dual-hosted git repository.

bzp2010 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 615ee41  test: fix way to check file installation (#6211)
615ee41 is described below

commit 615ee41312282ca2375abddae1d074637a901d89
Author: 罗泽轩 <spacewander...@gmail.com>
AuthorDate: Thu Jan 27 04:22:48 2022 +0800

    test: fix way to check file installation (#6211)
---
 ci/linux_apisix_current_luarocks_runner.sh | 4 +++-
 ci/linux_apisix_master_luarocks_runner.sh  | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/linux_apisix_current_luarocks_runner.sh 
b/ci/linux_apisix_current_luarocks_runner.sh
index a143d47..215e44a 100755
--- a/ci/linux_apisix_current_luarocks_runner.sh
+++ b/ci/linux_apisix_current_luarocks_runner.sh
@@ -30,11 +30,13 @@ script() {
     export_or_prefix
     openresty -V
 
-    sudo rm -rf /usr/local/apisix
+    sudo rm -rf /usr/local/share/lua/5.1/apisix
 
     # install APISIX with local version
     sudo luarocks install rockspec/apisix-master-0.rockspec --only-deps > 
build.log 2>&1 || (cat build.log && exit 1)
     sudo luarocks make rockspec/apisix-master-0.rockspec > build.log 2>&1 || 
(cat build.log && exit 1)
+    # ensure all files under apisix is installed
+    diff -rq apisix /usr/local/share/lua/5.1/apisix
 
     mkdir cli_tmp && cd cli_tmp
 
diff --git a/ci/linux_apisix_master_luarocks_runner.sh 
b/ci/linux_apisix_master_luarocks_runner.sh
index 37cb12e..a75fdf6 100755
--- a/ci/linux_apisix_master_luarocks_runner.sh
+++ b/ci/linux_apisix_master_luarocks_runner.sh
@@ -30,7 +30,7 @@ script() {
     export_or_prefix
     openresty -V
 
-    sudo rm -rf /usr/local/share/lua/5.1/apisix
+    sudo rm -rf /usr/local/apisix
 
     # run the test case in an empty folder
     mkdir tmp && cd tmp
@@ -38,8 +38,6 @@ script() {
 
     # install APISIX by luarocks
     sudo luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log && 
exit 1)
-    # ensure all files under ../apisix is installed
-    diff -rq ../apisix /usr/local/share/lua/5.1/apisix || exit 1
     cp ../bin/apisix /usr/local/bin/apisix
 
     # show install files