summaryrefslogtreecommitdiff
path: root/test/partest
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2009-07-01 10:57:19 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2009-07-01 10:57:19 +0000
commit7ac2fc34f7fabf846b4d5ebecf26eb63d123ab4b (patch)
treeb2145dae1624949588a458835df7a37ec01a7159 /test/partest
parentd17c979ce0259c8eb2ad678e63f1eb28f46737a6 (diff)
downloadscala-7ac2fc34f7fabf846b4d5ebecf26eb63d123ab4b.tar.gz
scala-7ac2fc34f7fabf846b4d5ebecf26eb63d123ab4b.tar.bz2
scala-7ac2fc34f7fabf846b4d5ebecf26eb63d123ab4b.zip
Fix for #2092
Diffstat (limited to 'test/partest')
-rwxr-xr-xtest/partest8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/partest b/test/partest
index 2d89d3e228..c6eb434d75 100755
--- a/test/partest
+++ b/test/partest
@@ -30,8 +30,12 @@ while [ -h "$SOURCE" ]; do
SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
fi;
done;
-SCALA_HOME=`dirname "$SOURCE"`/..;
-SCALA_HOME=`cd "$SCALA_HOME"; pwd`;
+
+# see #2092
+SCALA_HOME=`dirname "$SOURCE"`
+SCALA_HOME=`cd "$SCALA_HOME"; pwd -P`
+SCALA_HOME=`cd "$SCALA_HOME"/..; pwd`
+
if $cygwin; then
SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"`
SCALA_HOME=`cygpath --unix "$SCALA_HOME"`