diff options
| author | Heather Miller <heather.miller@epfl.ch> | 2012-04-15 14:51:18 +0200 |
|---|---|---|
| committer | Heather Miller <heather.miller@epfl.ch> | 2012-04-15 14:51:18 +0200 |
| commit | e4bea920b42eaa526a9e07ad001f17443d6abeba (patch) | |
| tree | c786202cc9d0fa5b1a26dfd8e1154cacca7fbaf4 /test/disabled/jvm/concurrent-future.check | |
| parent | 23aa1a8d7b08b767f90657baf9bc13a355682671 (diff) | |
| parent | 364dd41c3e0e33afe6c3ec6e0c04f1d345c4b6ca (diff) | |
| download | scala-e4bea920b42eaa526a9e07ad001f17443d6abeba.tar.gz scala-e4bea920b42eaa526a9e07ad001f17443d6abeba.tar.bz2 scala-e4bea920b42eaa526a9e07ad001f17443d6abeba.zip | |
Merge branch 'master' of https://github.com/scala/scala into wip-sip14-fixes
Diffstat (limited to 'test/disabled/jvm/concurrent-future.check')
| -rw-r--r-- | test/disabled/jvm/concurrent-future.check | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/disabled/jvm/concurrent-future.check b/test/disabled/jvm/concurrent-future.check new file mode 100644 index 0000000000..715ac90ce7 --- /dev/null +++ b/test/disabled/jvm/concurrent-future.check @@ -0,0 +1,14 @@ +test1: hai world +test1: kthxbye +test2: hai world +test2: awsum thx +test2: kthxbye +test3: hai world +test4: hai world +test4: kthxbye +test5: hai world +test5: kthxbye +test6: hai world +test6: kthxbye +test7: hai world +test7: kthxbye |