From 7e37689c5b3aa54bcd89d78fdb30bf19585e1fda Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 25 Jun 2011 09:37:55 -0400 Subject: [PATCH] drop test for unsupported configuration --- .../parent-ivy-settings/changes/ivysettings.xml | 9 --------- .../project/SettingsTest.scala | 16 ---------------- .../parent-ivy-settings/test | 13 ------------- 3 files changed, 38 deletions(-) delete mode 100644 sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml delete mode 100644 sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/SettingsTest.scala delete mode 100644 sbt/src/sbt-test/dependency-management/parent-ivy-settings/test diff --git a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml deleted file mode 100644 index a6de9d228..000000000 --- a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/SettingsTest.scala b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/SettingsTest.scala deleted file mode 100644 index ecc30123f..000000000 --- a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/SettingsTest.scala +++ /dev/null @@ -1,16 +0,0 @@ - import sbt._ - import Keys._ - -object SettingsTest extends Build -{ - lazy val parent: Project = Project("Parent", file(".")) aggregate(sub) settings( - externalIvySettings(), - ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) - ) - lazy val sub: Project = Project("Sub", file("sub"), delegates = parent :: Nil) dependsOn(compiler) aggregate(compiler) settings( - externalIvySettings() - ) - lazy val compiler = Project("Compiler", file("compiler"), delegates = sub :: Nil) settings( - libraryDependencies <+= scalaVersion( "org.scala-lang" % "scala-compiler" % _ ) - ) -} \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/test b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/test deleted file mode 100644 index 93c165b6f..000000000 --- a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/test +++ /dev/null @@ -1,13 +0,0 @@ --> update -> clean -$ copy-file changes/ivysettings.xml sub/ivysettings.xml - -> update -> clean - -$ delete sub/ivysettings.xml --> update -> clean - -$ copy-file changes/ivysettings.xml ivysettings.xml -> update \ No newline at end of file