Merge pull request #10543 from panyx0718/revert

Revert "CI: rerun failed tests. (#10536)"

paddle/fluid/inference/tensorrt/test_engine.cc

@@ -98,7 +98,7 @@ TEST_F(TensorRTEngineTest, add_layer_multi_dim) {
 
   float x_v[2] = {1.0, 2.0};
   engine_->SetInputFromCPU("x", reinterpret_cast<void*>(&x_v),
-                           2 * sizeof(float));
+  2 * sizeof(float));
   engine_->Execute(1);
 
   LOG(INFO) << "to get output";

paddle/scripts/docker/build.sh

@@ -100,14 +100,7 @@ function run_test() {
     Running unit tests ...
     ========================================
 EOF
-        set +e
         ctest --output-on-failure
-        if [ $? != 0 ]; then
-            set -e
-            ctest --output-on-failure --rerun-failed
-            set +e
-        fi
-        set -e
         # make install should also be test when unittest
         make install -j `nproc`
         pip install /usr/local/opt/paddle/share/wheels/*.whl

paddle/scripts/paddle_build.sh

@@ -299,14 +299,7 @@ function run_test() {
     Running unit tests ...
     ========================================
 EOF
-        set +e
         ctest --output-on-failure
-        if [ $? != 0 ]; then
-            set -e
-            ctest --output-on-failure --rerun-failed
-            set +e
-        fi
-        set -e
         # make install should also be test when unittest
         make install -j `nproc`
         pip install /usr/local/opt/paddle/share/wheels/*.whl
@@ -474,7 +467,6 @@ EOF
 }
 
 function main() {
-    set -e
     local CMD=$1
     init
     case $CMD in

paddle/scripts/paddle_docker_build.sh

@@ -59,7 +59,7 @@ EOL
     if [ ! -d "${HOME}/.ccache" ]; then
         mkdir ${HOME}/.ccache
     fi
-    set -ex
+    set -x
     ${DOCKER_CMD} run -it \
         --name $CONTAINER_ID \
         ${DOCKER_ENV} \