X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fscripts%2Fcompress_failed.sh;h=ff17d24462923202a67eadb12ed67a1c28985ad1;hb=03dd90adfe652894e4a70c6360e0618caae11145;hp=6076b3b3d0c94e7a001c334a3dedd42fe7a1252e;hpb=f413bef1358e014c9a6cb75bd2ec3e1f351e64ff;p=vpp.git

diff --git a/test/scripts/compress_failed.sh b/test/scripts/compress_failed.sh
index 6076b3b3d0c..ff17d244629 100755
--- a/test/scripts/compress_failed.sh
+++ b/test/scripts/compress_failed.sh
@@ -1,21 +1,37 @@
 #!/bin/bash
 
-if [ "$(ls -A ${VPP_TEST_FAILED_DIR})" ]
+if [ "$(ls -A ${FAILED_DIR})" ]
 then
-	if [ "${COMPRESS_FAILED_TEST_LOGS}" == "yes" ]
-	then
-		echo -n "Compressing files in temporary directories from failed test runs..."
-		cd ${VPP_TEST_FAILED_DIR}
-		for d in *
-		do
-			cd ${d}
-			find . ! -path . -print0 | xargs -0 -n1 gzip
-			cd ${VPP_TEST_FAILED_DIR}
-		done
-		echo "done."
-	else
-		echo "Not compressing files in temporary directories from failed test runs."
-	fi
+    if [ "${COMPRESS_FAILED_TEST_LOGS}" == "yes" ]
+    then
+	echo -n "Compressing files in temporary directories from failed test runs... "
+	cd ${FAILED_DIR}
+	for d in *
+	do
+	    cd ${d}
+	    find . ! -path . -print0 | xargs -0 -n1 gzip
+	    cd ${FAILED_DIR}
+	done
+	echo "done."
+        if [ -n "$WORKSPACE" ]
+        then
+            echo "Copying failed test logs into build log archive directory ($WORKSPACE/archives)... "
+            for failed_test in $(ls $FAILED_DIR)
+            do
+                mkdir -p $WORKSPACE/archives/$failed_test
+                cp -a $FAILED_DIR/$failed_test/* $WORKSPACE/archives/$failed_test
+            done
+	    echo "done."
+        fi
+
+    else
+	echo "Not compressing files in temporary directories from failed test runs."
+    fi
 else
-	echo "No symlinks to failed tests' temporary directories found in ${VPP_TEST_FAILED_DIR}."
+    echo "No symlinks to failed tests' temporary directories found in ${FAILED_DIR}."
 fi
+
+# This script gets run only if there was a 'make test' failure,
+# so return failure error status so that the build results are
+# recorded correctly.
+exit 1