fix

alibaba · Jul 12, 2024 · def1194 · def1194
1 parent 4c13fb4
commit def1194
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/scripts/gen_build_scripts.sh b/scripts/gen_build_scripts.sh
@@ -105,20 +105,14 @@ function generateCopyScript() {
       echo 'docker cp "$id":/src/core/build/ilogtail $BINDIR' >>$COPY_SCRIPT_FILE
       echo 'docker cp "$id":/src/core/build/go_pipeline/libPluginAdapter.so $BINDIR' >>$COPY_SCRIPT_FILE
     fi
-    if [ $BUILD_LOGTAIL_NOSPL_UT = "ON" ]; then
-      echo 'docker cp "$id":/src/core/build core/build' >>$COPY_SCRIPT_FILE
-    fi
-    if [ $BUILD_LOGTAIL_SPL_UT = "ON" ]; then
+    if [ $BUILD_LOGTAIL_NOSPL_UT = "ON" -o $BUILD_LOGTAIL_SPL_UT = "ON" ]; then
       echo 'docker cp "$id":/src/core/build core/build' >>$COPY_SCRIPT_FILE
     fi
   else
     echo 'docker cp "$id":/src/'${OUT_DIR}'/libPluginBase.so $BINDIR' >>$COPY_SCRIPT_FILE
     echo 'docker cp "$id":/src/core/build/ilogtail $BINDIR' >>$COPY_SCRIPT_FILE
     echo 'docker cp "$id":/src/core/build/go_pipeline/libPluginAdapter.so $BINDIR' >>$COPY_SCRIPT_FILE
-    if [ $BUILD_LOGTAIL_NOSPL_UT = "ON" ]; then
-      echo 'docker cp "$id":/src/core/build core/build' >>$COPY_SCRIPT_FILE
-    fi
-    if [ $BUILD_LOGTAIL_SPL_UT = "ON"]; then
+    if [ $BUILD_LOGTAIL_NOSPL_UT = "ON" -o $BUILD_LOGTAIL_SPL_UT = "ON" ]; then
       echo 'docker cp "$id":/src/core/build core/build' >>$COPY_SCRIPT_FILE
     fi
   fi

diff --git a/scripts/run_core_ut.sh b/scripts/run_core_ut.sh
@@ -37,14 +37,5 @@ search_files() {
 # Maybe some unittest depend on relative paths, so execute in the unittest directory
 UT_BASE_PATH="$(pwd)/${TARGET_ARTIFACT_PATH:2}"
 export LD_LIBRARY_PATH=${UT_BASE_PATH}:$LD_LIBRARY_PATH
-pwd
-ls
-cd ./core
-pwd
-ls
-cd ./build
-pwd
-ls
-cd ../..
 cd $TARGET_ARTIFACT_PATH
 search_files .