diff options
| author | Mridul Muralidharan <mridulm80@apache.org> | 2014-04-24 20:48:33 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-04-24 20:48:33 -0700 |
| commit | 968c0187a12f5ae4a696c02c1ff088e998ed7edd (patch) | |
| tree | a08997fe5f5debfaae4b55770cee37d9d53c739c /repl/src | |
| parent | d5c6ae6cc3305b9aa3185486b5b6ba0a6e5aca90 (diff) | |
| download | spark-968c0187a12f5ae4a696c02c1ff088e998ed7edd.tar.gz spark-968c0187a12f5ae4a696c02c1ff088e998ed7edd.tar.bz2 spark-968c0187a12f5ae4a696c02c1ff088e998ed7edd.zip | |
SPARK-1586 Windows build fixes
Unfortunately, this is not exhaustive - particularly hive tests still fail due to path issues.
Author: Mridul Muralidharan <mridulm80@apache.org>
This patch had conflicts when merged, resolved by
Committer: Matei Zaharia <matei@databricks.com>
Closes #505 from mridulm/windows_fixes and squashes the following commits:
ef12283 [Mridul Muralidharan] Move to org.apache.commons.lang3 for StringEscapeUtils. Earlier version was buggy appparently
cdae406 [Mridul Muralidharan] Remove leaked changes from > 2G fix branch
3267f4b [Mridul Muralidharan] Fix build failures
35b277a [Mridul Muralidharan] Fix Scalastyle failures
bc69d14 [Mridul Muralidharan] Change from hardcoded path separator
10c4d78 [Mridul Muralidharan] Use explicit encoding while using getBytes
1337abd [Mridul Muralidharan] fix classpath while running in windows
Diffstat (limited to 'repl/src')
| -rw-r--r-- | repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala b/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala index 4155007c6d..e33f4f9803 100644 --- a/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala +++ b/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala @@ -25,6 +25,7 @@ import scala.collection.mutable.ArrayBuffer import com.google.common.io.Files import org.scalatest.FunSuite import org.apache.spark.SparkContext +import org.apache.commons.lang3.StringEscapeUtils class ReplSuite extends FunSuite { @@ -185,11 +186,12 @@ class ReplSuite extends FunSuite { out.close() val output = runInterpreter("local", """ - |var file = sc.textFile("%s/input").cache() + |var file = sc.textFile("%s").cache() |file.count() |file.count() |file.count() - """.stripMargin.format(tempDir.getAbsolutePath)) + """.stripMargin.format(StringEscapeUtils.escapeJava( + tempDir.getAbsolutePath + File.separator + "input"))) assertDoesNotContain("error:", output) assertDoesNotContain("Exception", output) assertContains("res0: Long = 3", output) |