From a2973dfd954c0c094f956becb05a82bee5f7da01 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Thu, 16 Jul 2015 13:06:38 +1000
Subject: Remove further references to forkjoin

Use j.u.c.Forkjoin directly in active and disabled tests

Remove bitrotted benchmarks code

I was going to update these to use `java.util.concurrent.ForkJoin`
directly, instead of our deprecated stubs.

But most of them don't compile anymore (e.g. scala.testing.Benchmark
has been removed, ClassTag imports missing).

While I'm all for benchmarks, we should have large swathes of code
checked in that isn't at compiled and run automatically.

I'm happy to help someone resurrect these in a suitable form.
---
 test/benchmarks/bench | 63 ---------------------------------------------------
 1 file changed, 63 deletions(-)
 delete mode 100755 test/benchmarks/bench

(limited to 'test/benchmarks/bench')

diff --git a/test/benchmarks/bench b/test/benchmarks/bench
deleted file mode 100755
index 3aa7e7468c..0000000000
--- a/test/benchmarks/bench
+++ /dev/null
@@ -1,63 +0,0 @@
-
-#################################################################
-#  
-# A simple script used to rebuild benchmarks using fsc and then run them.
-# If you need to rebuild, use: 
-# 
-#   ./bench <arguments>
-# 
-# Omitting <arguments> will print more information.
-# If you don't want to rebuild:
-# 
-#   ./bench skip <same-args-as-above>
-#
-#################################################################
-
-
-TOP_DIR=$PWD
-# build/pack for ant, target/pack for sbt
-SCALA_BUILD_DIR=../../target/pack 
-SRC_DIR=src/
-TARGET_DIR=target
-CLASS_DIR=$TARGET_DIR/classes
-
-FSC=$SCALA_BUILD_DIR/bin/fsc
-SCALA_LIBS_PATH=$SCALA_BUILD_DIR/lib
-CLASSPATH=$SCALA_LIBS_PATH/scala-library.jar:lib/jsr166_and_extra.jar
-
-ARTIFACT=benchmarks.jar
-ARTIFACT_PATH=$TARGET_DIR/$ARTIFACT
-
-
-if [ "$1" != "skip" ]
-then
-  # fetch source file list
-  find $SRC_DIR -name *.scala -print > source.list
-  
-  # 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
-  jar cf $ARTIFACT .
-  mv $ARTIFACT $TOP_DIR/$ARTIFACT_PATH
-  cd $TOP_DIR
-fi
-
-# run a benchmark
-RUNCOMMAND="java -Xms256m -Xmx512m -server -cp $CLASSPATH:$ARTIFACT_PATH scala.collection.parallel.Benchmarking "
-if [ "$1" != skip ]
-then
-  $RUNCOMMAND "$@"
-else
-  $RUNCOMMAND $2 $3 $4 $5 $6 $7 $8
-fi
-
-
-
-- 
cgit v1.2.3