Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

METAGEN-104 Improving the way the test source directory is discovered

This commit is contained in:
Hardy Ferentschik 2013-10-29 17:36:13 +01:00 committed by Strong Liu
parent 052012776e
commit b98c45f904
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationStatement.java
View File

@ -36,10 +36,13 @@ public class CompilationStatement extends Statement {
private static final String SOURCE_BASE_DIR; private static final String SOURCE_BASE_DIR;
static { static {
// first we try to guess the target directory. This will work, if the build is triggered from the // first we try to guess the target directory.
// command line or the output directory used by the id is within the project directory (eg 'out' in Intellij). File potentialSourceDirectory = new File(System.getProperty( "user.dir" ), "tooling/metamodel-generator/src/test/java");
File targetDir = TestUtil.getTargetDir();
File potentialSourceDirectory = new File( targetDir.getParent(), "src/test/java" ); // the command line build sets the user.dir to sub project directory
if ( !potentialSourceDirectory.exists() ) {
potentialSourceDirectory = new File(System.getProperty( "user.dir" ), "src/test/java");
}
if ( potentialSourceDirectory.exists() ) { if ( potentialSourceDirectory.exists() ) {
SOURCE_BASE_DIR = potentialSourceDirectory.getAbsolutePath(); SOURCE_BASE_DIR = potentialSourceDirectory.getAbsolutePath();