# HG changeset patch
# User tpivovarova
# Date 1418987542 -10800
#      Fri Dec 19 14:12:22 2014 +0300
# Node ID 3e27bd1d717a42940b63e0e7c3993862dbf11d76
# Parent  01affeae883465477a734bb26e294c59cc4d6540
8062012: test/compiler/ciReplay/TestSA.sh should be updated to work w/ modular image build
Reviewed-by: iignatyev

diff --git a/test/compiler/ciReplay/TestSA.sh b/test/compiler/ciReplay/TestSA.sh
--- a/test/compiler/ciReplay/TestSA.sh
+++ b/test/compiler/ciReplay/TestSA.sh
@@ -26,7 +26,7 @@
 ##
 ## @test
 ## @bug 8011675
-## @ignore 8031978
+## @ignore 8029528
 ## @summary testing of ciReplay with using generated by SA replay.txt 
 ## @author igor.ignatyev@oracle.com
 ## @run shell TestSA.sh
@@ -69,7 +69,6 @@
 
 echo "dumpreplaydata -a > ${replay_data}" | \
         ${JAVA} ${TESTOPTS} \
-        -cp ${TESTJAVA}${FS}lib${FS}sa-jdi.jar \
         sun.jvm.hotspot.CLHSDB  ${JAVA} ${core_file}
 
 if [ ! -s ${replay_data} ]
diff --git a/test/compiler/ciReplay/common.sh b/test/compiler/ciReplay/common.sh
--- a/test/compiler/ciReplay/common.sh
+++ b/test/compiler/ciReplay/common.sh
@@ -263,10 +263,10 @@
         dir=`dirname $core_with_dir`
         file=`basename $core_with_dir`
         # add <core_path>/core.<pid> core
-        core_locations="'$core_with_dir' '$file'"
+        core_locations='$core_with_dir' '$file'
         if [ -n "${core_with_pid}" ]
         then
-            core_locations="$core_locations '$core_with_pid' '$dir${FS}$core_with_pid'"
+            core_locations=$core_locations '$core_with_pid' '$dir${FS}$core_with_pid'
         fi
     fi