just for information, before someone asks: I know I broke one Jenkins job when hoping to fix another one...
I'll continue my tests tonight to fix these jobs *at the same time* :) Regards, Herve Le dimanche 9 mars 2014 19:43:48 hbout...@apache.org a écrit : > Repository: maven-integration-testing > Updated Branches: > refs/heads/master 9f11d8d70 -> b79791ee7 > > > fix ITs when current path contains a Unix symbolic link (failures > reproduced on ASF Jenkins > https://builds.apache.org/job/core-integration-testing-maven-3-embedded) > > Project: > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo > Commit: > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/b79 > 791ee Tree: > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/b7979 > 1ee Diff: > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/b7979 > 1ee > > Branch: refs/heads/master > Commit: b79791ee7dfc7c1f943ed03ded2875e1b5073503 > Parents: 9f11d8d > Author: Hervé Boutemy <hbout...@apache.org> > Authored: Sun Mar 9 20:43:44 2014 +0100 > Committer: Hervé Boutemy <hbout...@apache.org> > Committed: Sun Mar 9 20:43:44 2014 +0100 > > ---------------------------------------------------------------------- > .../maven/it/MavenITmng2201PluginConfigInterpolationTest.java | 2 +- > .../org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java | 2 +- > .../maven/it/MavenITmng3747PrefixedPathExpressionTest.java | 2 +- > .../org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java | 4 ++-- > .../java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java | 2 +- > .../apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java | 2 +- > .../apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java | 2 +- > .../maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java | 2 +- > .../apache/maven/it/MavenITmng3944BasedirInterpolationTest.java | 4 ++-- > .../org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java | 2 +- > 10 files changed, 12 insertions(+), 12 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfi > gInterpolationTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfi > gInterpolationTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfi > gInterpolationTest.java index 39e5585..13ba7ed 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfi > gInterpolationTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfi > gInterpolationTest.java @@ -53,7 +53,7 @@ public class > MavenITmng2201PluginConfigInterpolationTest verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > Properties props = verifier.loadProperties( > "target/config.properties" ); assertEquals( new File( testDir, "target" ), > new File( props.getProperty( "stringParam" ) ) ); > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAligned > DirTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAligned > DirTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAligned > DirTest.java index 0baebdf..f3a4e6c 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAligned > DirTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAligned > DirTest.java @@ -56,7 +56,7 @@ public class MavenITmng3475BaseAlignedDirTest > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > Properties configProps = verifier.loadProperties( > "target/config.properties" ); > > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPat > hExpressionTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPat > hExpressionTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPat > hExpressionTest.java index dea9ae0..62fb2ad 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPat > hExpressionTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPat > hExpressionTest.java @@ -54,7 +54,7 @@ public class > MavenITmng3747PrefixedPathExpressionTest verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > Properties props = verifier.loadProperties( > "target/config.properties" ); assertEquals( "path is: " + new File( > testDir, "relative" ).getAbsolutePath() + "/somepath", > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriProp > ertyTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriProp > ertyTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriProp > ertyTest.java index 61c36f2..2251367 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriProp > ertyTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriProp > ertyTest.java @@ -53,7 +53,7 @@ public class > MavenITmng3760BaseUriPropertyTest > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > Properties props = verifier.loadProperties( > "target/profile.properties" ); // set via project > @@ -77,7 +77,7 @@ public class MavenITmng3760BaseUriPropertyTest > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > Properties props = verifier.loadProperties( > "target/profile.properties" ); // set via project > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfi > gTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfi > gTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfi > gTest.java index aa17254..7bfe441 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfi > gTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfi > gTest.java @@ -57,7 +57,7 @@ public class MavenITmng3827PluginConfigTest > > Properties props = verifier.loadProperties( > "target/plugin-config.properties" ); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > assertEquals( new File( testDir, "pom.xml" ), new File( > props.getProperty( "fileParam" ) ) ); assertEquals( "true", > props.getProperty( "booleanParam" ) ); > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPlug > inConfigTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPlug > inConfigTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPlug > inConfigTest.java index 8898a39..feb1df6 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPlug > inConfigTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPlug > inConfigTest.java @@ -57,7 +57,7 @@ public class > MavenITmng3864PerExecPluginConfigTest > > Properties props = verifier.loadProperties( > "target/plugin-config.properties" ); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > assertEquals( new File( testDir, "pom.xml" ), new File( > props.getProperty( "fileParam" ) ) ); assertEquals( "true", > props.getProperty( "booleanParam" ) ); > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlig > nedModelTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlig > nedModelTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlig > nedModelTest.java index 925a55f..4650294 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlig > nedModelTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlig > nedModelTest.java @@ -55,7 +55,7 @@ public class > MavenITmng3877BasedirAlignedModelTest verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > Properties modelProps = verifier.loadProperties( > "target/model.properties" ); > > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuild > DirInterpolationTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuild > DirInterpolationTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuild > DirInterpolationTest.java index 0551c62..52d0936 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuild > DirInterpolationTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuild > DirInterpolationTest.java @@ -56,7 +56,7 @@ public class > MavenITmng3904NestedBuildDirInterpolationTest > verifier.verifyErrorFreeLog(); > verifier.resetStreams(); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > Properties props = verifier.loadProperties( "target/pom.properties" > ); assertEquals( new File( testDir, "target/classes/dir0" ), > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInte > rpolationTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInte > rpolationTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInte > rpolationTest.java index c50db1a..74494b6 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInte > rpolationTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInte > rpolationTest.java @@ -58,8 +58,8 @@ public class > MavenITmng3944BasedirInterpolationTest > > verifier.assertFilePresent( "target/basedir.properties" ); > Properties props = verifier.loadProperties( > "target/basedir.properties" ); - assertEquals( > testDir.getCanonicalFile(), new File( props.getProperty( > "project.properties.prop0" ) ) ); - assertEquals( > testDir.getCanonicalFile(), new File( props.getProperty( > "project.properties.prop1" ) ) ); + assertEquals( testDir, new File( > props.getProperty( "project.properties.prop0" ) ) ); + assertEquals( > testDir, new File( props.getProperty( "project.properties.prop1" ) ) ); } > > } > > http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b79791 > ee/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePat > hsTest.java > ---------------------------------------------------------------------- diff > --git > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePat > hsTest.java > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePat > hsTest.java index a751255..4cfac28 100644 > --- > a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePat > hsTest.java +++ > b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePat > hsTest.java @@ -70,7 +70,7 @@ public class MavenITmng3951AbsolutePathsTest > verifier.assertFilePresent( "target/path.properties" ); > Properties props = verifier.loadProperties( > "target/path.properties" ); > > - testDir = testDir.getCanonicalFile(); > + //testDir = testDir.getCanonicalFile(); > > assertEquals( new File( testDir, "tmp" ).getAbsoluteFile(), new > File( props.getProperty( "fileParams.0" ) ) ); assertEquals( new File( > getRoot( testDir ), "tmp" ).getAbsoluteFile(), new File( props.getProperty( > "fileParams.1" ) ) ); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
