summaryrefslogtreecommitdiff
path: root/test/benchmarks/bench
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-12-21 17:41:31 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-12-21 17:41:31 +0000
commit003fc687839528bf99b44a415a038eb13ef8eae5 (patch)
tree597e57e8882449865bcde4c214188bb87c4709df /test/benchmarks/bench
parentcc1f960036c0f60caca6c8f862701dd37bac2f50 (diff)
downloadscala-003fc687839528bf99b44a415a038eb13ef8eae5.tar.gz
scala-003fc687839528bf99b44a415a038eb13ef8eae5.tar.bz2
scala-003fc687839528bf99b44a415a038eb13ef8eae5.zip
Bencharking a larger program with parallel coll...
Bencharking a larger program with parallel collections. Fixed a couple of bugs in parallel collections. No review.
Diffstat (limited to 'test/benchmarks/bench')
-rwxr-xr-xtest/benchmarks/bench8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/benchmarks/bench b/test/benchmarks/bench
index b441b283f8..3aa7e7468c 100755
--- a/test/benchmarks/bench
+++ b/test/benchmarks/bench
@@ -15,7 +15,8 @@
TOP_DIR=$PWD
-SCALA_BUILD_DIR=../../build/pack
+# build/pack for ant, target/pack for sbt
+SCALA_BUILD_DIR=../../target/pack
SRC_DIR=src/
TARGET_DIR=target
CLASS_DIR=$TARGET_DIR/classes
@@ -36,6 +37,11 @@ then
# recompile with fsc
$FSC -cp $CLASSPATH -d $CLASS_DIR @source.list
+ # copy files
+ cd $SRC_DIR
+ cp -r * ../$CLASS_DIR
+ cd ..
+
# jar it up
rm $ARTIFACT_PATH
cd $CLASS_DIR