fixup! JBR-4567 fix checking test status

jb/project/tools/test/perfcmp.sh

@@ -60,7 +60,13 @@ else
   testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +1`
 fi
 
-testContent=`echo "$testContent" | awk -F'\t' '{ if ($3>$2+$2*0.1) {print "* "$1"\t"$2"\t"$3"\t"(($2==0)?"-":$3/$2)} else {print "  "$1"\t"$2"\t"$3"\t"(($2==0)?"-":$3/$2)} }'`
+testContent=`echo "$testContent" | tr "," "." | awk -F'\t' '{
+  if ($3>$2+$2*0.1) {
+    print "* "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
+  } else {
+    print "  "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
+  }
+}'`
 if [ -z $noHeaders ]; then
   echo "$header" > $resFile
 fi
@@ -71,12 +77,12 @@ if [ -z $tc ]; then
 exit 0
 fi
 
-failed=1
+failed=0
 echo "$testContent" 2>&1 | (
     while read -r s; do
         testname=`echo "$s" | cut -f 1 | tr -d "[:space:]" |  tr -d "*"`
         duration=`echo "$s" | cut -f 3`
-        echo "$s" | cut -c1 | grep -c "*" && failed=0
+        echo "$s" | cut -c1 | grep -c "*" && failed=1
         echo \#\#teamcity[testStarted name=\'$testNamePrefix$testname\']
         echo "===>$s"
         echo \#\#teamcity[buildStatisticValue key=\'$testNamePrefix$testname\' value=\'$duration\']

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -59,8 +59,8 @@ function create_image_bundle {
     --module-path $__modules_path --no-man-pages --compress=2 \
     --add-modules $__modules --output $__root_dir || do_exit $?
 
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__arch_name/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
+    if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
     sed 's/JBR/JBRSDK/g' $__root_dir/release > release
     mv release $__root_dir/release
     for dir in $(ls -d $IMAGES_DIR/jdk/*); do

jb/project/tools/windows/scripts/mkimages_x86.sh

@@ -54,7 +54,7 @@ function create_image_bundle {
     --module-path $__modules_path --no-man-pages --compress=2 \
     --add-modules $__modules --output $__root_dir || do_exit $?
 
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__arch_name/release
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
   if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
     sed 's/JBR/JBRSDK/g' $__root_dir/release > release
     mv release $__root_dir/release

test/jdk/jb/java/awt/Desktop/AboutHandlerTest.java

@@ -21,6 +21,8 @@ import java.awt.Desktop;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @test
@@ -33,7 +35,10 @@ import java.awt.event.KeyEvent;
  */
 
 public class AboutHandlerTest {
-    private static final int WAIT_TIME = 1000;
+
+    private static CountDownLatch doneSignal = new CountDownLatch(1);
+
+    private static final int WAIT_TIME = 3000;
 
     private static Robot robot;
 
@@ -45,9 +50,11 @@ public class AboutHandlerTest {
         robot = new Robot();
         robot.setAutoDelay(50);
 
+        long starttime = System.currentTimeMillis();
         Desktop.getDesktop().setAboutHandler(e -> {
             System.out.println("AboutHandler hits");
             testPassed = true;
+            doneSignal.countDown();
         });
 
         SwingUtilities.invokeLater(() -> {
@@ -55,8 +62,9 @@ public class AboutHandlerTest {
         });
 
         // waiting for AboutHandler
-        sleep(WAIT_TIME);
-
+        doneSignal.await(WAIT_TIME, TimeUnit.SECONDS);
+        long endtime = System.currentTimeMillis();
+        System.out.println("Duration (milisec): " + (endtime - starttime));
         myApp.dispose();
 
         if (!testPassed)
@@ -85,8 +93,4 @@ public class AboutHandlerTest {
         robot.keyPress(KeyEvent.VK_ENTER);
         robot.keyRelease(KeyEvent.VK_ENTER);
     }
-
-    private static void sleep(int millis) throws InterruptedException {
-        Thread.sleep(millis);
-    }
 }