Browse Source

Fixed the bug of test script, which would abort the test execution when skipping the update of submodules;

tags/1.2.0^2
huanghaiquan 4 years ago
parent
commit
a3d30e6351
2 changed files with 5 additions and 4 deletions
  1. +1
    -1
      build/repo.sh
  2. +4
    -3
      build/test.sh

+ 1
- 1
build/repo.sh View File

@@ -106,7 +106,7 @@ done
#检查是否要跳过子模块更新环节;
if [ $SKIP_SUBMODULES_UPDATE == 1 ]
then
echo "跳过子模块代码更新操作。。。"
echo "跳过子模块代码更新操作。。。[$RTN]"
${RTN}
fi



+ 4
- 3
build/test.sh View File

@@ -1,4 +1,5 @@

#定义子脚本的错误返回命令
RTN="return"

#调用当前脚本目录下 env.sh 脚本,设置环境变量,处理当前传入参数;
if [ ! $ENV_SHELL ]
@@ -13,7 +14,7 @@ source $UPDATE_SHELL
ERR=$?
if [ $ERR != 0 ]
then
echo "更新代码库时发生了错误[$ERR]!!终止测试!!"
echo "更新代码库时发生了错误[$ERR]!!终止测试!! [$RTN]"
${RTN} $ERR
fi

@@ -30,7 +31,7 @@ mvn clean package
ERR=$?
if [ $ERR != 0 ]
then
echo "集成测试过程中发生了错误[$ERR]!!终止测试!!"
echo "集成测试过程中发生了错误[$ERR]!!终止测试!! [$RTN]"
${RTN} $ERR
fi


Loading…
Cancel
Save