summaryrefslogtreecommitdiff
path: root/test/instrumented/srt.patch
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-14 08:32:34 -0800
committerPaul Phillips <paulp@improving.org>2012-02-14 13:55:19 -0800
commit94166682eed2a49038d9bdc1515e0b2f0630ab20 (patch)
tree630517b403c4c00dd4c2a3f2839b991402d96635 /test/instrumented/srt.patch
parenta2ce52f838d7ae4a1af93e5149e38ef87e9cd06d (diff)
downloadscala-94166682eed2a49038d9bdc1515e0b2f0630ab20.tar.gz
scala-94166682eed2a49038d9bdc1515e0b2f0630ab20.tar.bz2
scala-94166682eed2a49038d9bdc1515e0b2f0630ab20.zip
Made speclib less of a maintenance headache.
Now it copies in the current versions of BoxesRunTime and ScalaRunTime and applies patches to them, and the whole build is automated. # This is the only thing I actually typed, the rest is fancy echo. $ test/instrumented/mkinstrumented.sh build % rm -rf /scratch/trunk1/test/instrumented/classes % cp /scratch/trunk1/test/instrumented/../../src/library/scala/runtime/BoxesRunTime.java /scratch/trunk1/test/instrumented/../../src/library/scala/runtime/ScalaRunTime.scala /scratch/trunk1/test/instrumented/library/scala/runtime % patch BoxesRunTime.java /scratch/trunk1/test/instrumented/boxes.patch patching file BoxesRunTime.java % patch ScalaRunTime.scala /scratch/trunk1/test/instrumented/srt.patch patching file ScalaRunTime.scala Hunk #3 succeeded at 63 (offset 23 lines). Hunk #4 succeeded at 78 (offset 23 lines). Hunk #5 succeeded at 81 (offset 23 lines). Hunk #6 succeeded at 96 (offset 23 lines). % /scratch/trunk1/test/instrumented/../../build/pack/bin/scalac -d /scratch/trunk1/test/instrumented/classes /scratch/trunk1/test/instrumented/library/scala/runtime/BoxesRunTime.java /scratch/trunk1/test/instrumented/library/scala/runtime/ScalaRunTime.scala % javac -cp /scratch/trunk1/test/instrumented/../../build/pack/lib/scala-library.jar -d /scratch/trunk1/test/instrumented/classes /scratch/trunk1/test/instrumented/library/scala/runtime/BoxesRunTime.java % cd /scratch/trunk1/test/instrumented/classes % jar cf instrumented.jar . % mv -f instrumented.jar /scratch/trunk1/test/instrumented/../../test/files/speclib /scratch/trunk1/test/files/speclib/instrumented.jar has been created.
Diffstat (limited to 'test/instrumented/srt.patch')
-rw-r--r--test/instrumented/srt.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/test/instrumented/srt.patch b/test/instrumented/srt.patch
new file mode 100644
index 0000000000..2f472ff1c0
--- /dev/null
+++ b/test/instrumented/srt.patch
@@ -0,0 +1,23 @@
+9a10,11
+> /* INSTRUMENTED VERSION */
+>
+33a36,38
+> var arrayApplyCount = 0
+> var arrayUpdateCount = 0
+>
+35c40,42
+< def array_apply(xs: AnyRef, idx: Int): Any = xs match {
+---
+> def array_apply(xs: AnyRef, idx: Int): Any = {
+> arrayApplyCount += 1
+> xs match {
+47a55
+> }
+50c58,60
+< def array_update(xs: AnyRef, idx: Int, value: Any): Unit = xs match {
+---
+> def array_update(xs: AnyRef, idx: Int, value: Any): Unit = {
+> arrayUpdateCount += 1
+> xs match {
+62a73
+> }