summaryrefslogtreecommitdiff
path: root/test/files/instrumented/InstrumentationTest.scala
diff options
context:
space:
mode:
authorSimon Ochsenreither <simon@ochsenreither.de>2013-12-08 18:05:47 +0100
committerSimon Ochsenreither <simon@ochsenreither.de>2013-12-08 18:05:47 +0100
commit85692fffdda6e40f8e587282ab975899133bffba (patch)
tree1edf8942a98334ddfcbc11d6f7046ca4323c99ed /test/files/instrumented/InstrumentationTest.scala
parentd938f59e40e7ba97b199e5f70f252d191c19d93e (diff)
downloadscala-85692fffdda6e40f8e587282ab975899133bffba.tar.gz
scala-85692fffdda6e40f8e587282ab975899133bffba.tar.bz2
scala-85692fffdda6e40f8e587282ab975899133bffba.zip
SI-8050 [Avian] Skip instrumented tests
Instrumentation is (currently) not supported on Avian. This causes - tests instrumented/InstrumentationTest.scala and - instrumented/inline-in-constructors to fail. Let's skip these tests on Avian.
Diffstat (limited to 'test/files/instrumented/InstrumentationTest.scala')
-rw-r--r--test/files/instrumented/InstrumentationTest.scala27
1 files changed, 16 insertions, 11 deletions
diff --git a/test/files/instrumented/InstrumentationTest.scala b/test/files/instrumented/InstrumentationTest.scala
index 0e53f80857..458fd4974b 100644
--- a/test/files/instrumented/InstrumentationTest.scala
+++ b/test/files/instrumented/InstrumentationTest.scala
@@ -15,16 +15,21 @@ package instrumented {
/** Tests if instrumentation itself works correctly */
object Test {
def main(args: Array[String]) {
- // force predef initialization before profiling
- Predef
- startProfiling()
- val foo1 = new Foo1
- foo1.someMethod
- val foo2 = new instrumented.Foo2
- foo2.someMethod
- // should box the boolean
- println(true)
- stopProfiling()
- printStatistics()
+ if (scala.tools.partest.utils.Properties.isAvian) {
+ println("!!!TEST SKIPPED!!!")
+ println("Instrumentation is not supported on Avian.")
+ } else {
+ // force predef initialization before profiling
+ Predef
+ startProfiling()
+ val foo1 = new Foo1
+ foo1.someMethod
+ val foo2 = new instrumented.Foo2
+ foo2.someMethod
+ // should box the boolean
+ println(true)
+ stopProfiling()
+ printStatistics()
+ }
}
}