create-new-baseline: defer commit to some other stage/process

1 files changed, 5 insertions, 12 deletions

diff --git a/create-new-baseline b/create-new-baseline
index 40413203..70465387 100755
--- a/create-new-baseline
+++ b/create-new-baseline
@@ -31,7 +31,7 @@ if [ $CLEANUP -eq 1 ]; then
     git clean -f -d -x
 fi
 
-set -xeu
+set -eu
 
 if [ ! -f ${snapshot}.tar.bz2 ]; then
     wget --quiet ${URL}/${snapshot}.tar.bz2
@@ -42,12 +42,7 @@ if [ ! -f ${snapshot}-prebuilt-classes.tar.bz2 ]; then
 fi
 
 if [ -d $snapshot ]; then
-    git ls-files --error-unmatch $snapshot
-    if [ $? -eq 1 ]; then
-	rm -rf $snapshot
-    else
-	git rm -rf $snapshot
-    fi
+    git rm -rf $snapshot 2>/dev/null || echo "Success!"
 fi
 
 tar axf ${snapshot}-prebuilt-classes.tar.bz2
@@ -55,13 +50,11 @@ tar axf ${snapshot}.tar.bz2 ${snapshot}/jdk/test ${snapshot}/hotspot/test
 
 shopt -s globstar
 
-for i in aarch64-known-problems/**/*.txt; do
-    cat $i >> ${i/aarch64-known-problems/${snapshot}}
+for i in known-problems/${snapshot}/**/*.txt; do
+    echo "Adding $i >> ${i/known-problems\//}"
+    cat $i >> ${i/known-problems\//}
 done
 
 git add ${snapshot}/jdk/test
 git add ${snapshot}/hotspot/test
 git add ${snapshot}/JTwork
-
-git commit --allow-empty -m "${COMMIT_MSG}" -a
-git clean -f -d -x