From 119c9554cf948163433ab12ce8cdd36814f63e4a Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Thu, 23 Feb 2012 10:39:31 -0800
Subject: Make partest not fail over code.jar's placement.

---
 src/partest/scala/tools/partest/nest/PathSettings.scala | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/partest')

diff --git a/src/partest/scala/tools/partest/nest/PathSettings.scala b/src/partest/scala/tools/partest/nest/PathSettings.scala
index e0a2f65b80..4fe337b19f 100644
--- a/src/partest/scala/tools/partest/nest/PathSettings.scala
+++ b/src/partest/scala/tools/partest/nest/PathSettings.scala
@@ -43,9 +43,11 @@ object PathSettings {
   // Directory <root>/test/files/codelib
   lazy val srcCodeLibDir = Directory(srcDir / "codelib")
 
-  lazy val srcCodeLib: File = findJar(srcCodeLibDir, "code") getOrElse {
-    sys.error("No code.jar found in %s".format(srcCodeLibDir))
-  }
+  lazy val srcCodeLib: File = (
+    findJar(srcCodeLibDir, "code") 
+      orElse findJar(Directory(testRoot / "files" / "codelib"), "code") // work with --srcpath pending
+      getOrElse sys.error("No code.jar found in %s".format(srcCodeLibDir))
+  )
 
   // Directory <root>/build
   lazy val buildDir: Directory = {
-- 
cgit v1.2.3