summaryrefslogtreecommitdiff
path: root/test/files/instrumented/inline-in-constructors
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/inline-in-constructors
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/inline-in-constructors')
-rw-r--r--test/files/instrumented/inline-in-constructors/test_3.scala21
1 files changed, 13 insertions, 8 deletions
diff --git a/test/files/instrumented/inline-in-constructors/test_3.scala b/test/files/instrumented/inline-in-constructors/test_3.scala
index c4d4cc5f37..949e9945e7 100644
--- a/test/files/instrumented/inline-in-constructors/test_3.scala
+++ b/test/files/instrumented/inline-in-constructors/test_3.scala
@@ -3,13 +3,18 @@ import instrumented._
object Test {
def main(args: Array[String]) {
- // force predef initialization before profiling
- Predef
- MyPredef
- startProfiling()
- val a = new Foo(2)
- val b = new Bar(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
+ MyPredef
+ startProfiling()
+ val a = new Foo(2)
+ val b = new Bar(true)
+ stopProfiling()
+ printStatistics()
+ }
}
}