summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew McDermott <andrew.mcdermott@linaro.org>2013-09-23 11:53:58 +0100
committerAndrew McDermott <andrew.mcdermott@linaro.org>2013-09-23 11:53:58 +0100
commite08a3ba8b90bac90ffc775afbbfc5e6d84ed9f2e (patch)
tree31f837c5052e428c004da8f6b2498d3074402e6e
parent5831253a060094310d2ae45219d81293111b20a5 (diff)
jtreg-lava: replace timeout:4 with timeout:15
-rwxr-xr-xjtreg/linux/bin/jtreg-lava3
1 files changed, 2 insertions, 1 deletions
diff --git a/jtreg/linux/bin/jtreg-lava b/jtreg/linux/bin/jtreg-lava
index 4c1e27e..9bf61a3 100755
--- a/jtreg/linux/bin/jtreg-lava
+++ b/jtreg/linux/bin/jtreg-lava
@@ -100,6 +100,7 @@ for i in "$@" ; do
-J* ) javaOpts=$javaOpts$nl`echo $i | sed -e 's/^-J//'` ;;
-agentvm) jtregOpts=$jtregOpts$nl'-samevm' ;;
-w:* ) work_dir=`echo $i | sed -e 's/^-w:\(.*\)/\1/'`; jtregOpts=$jtregOpts$nl$i ;;
+ -timeout:4 ) jtregOpts=$jtregOpts$nl'-timeout:15' ;;
* ) jtregOpts=$jtregOpts$nl$i ;;
esac
IFS="$saveIFS"
@@ -148,7 +149,7 @@ if [ -n "$JTREG_LAVA_PREBUILT_CLASSES_DIR" ]; then
for i in /sys/devices/system/cpu/cpu[0-9]*; do
a=`basename $i`
a=`echo $a | sed s/cpu//`
- mkdir $work_dir/classes/$a
+ mkdir -p $work_dir/classes/$a
cp -r $JTREG_LAVA_PREBUILT_CLASSES_DIR/* $work_dir/classes/$a
done
fi