You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/02/03 13:24:14 UTC
svn commit: r1240126 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command:
checkin/ checkout/
Author: olamy
Date: Fri Feb 3 12:24:13 2012
New Revision: 1240126
URL: http://svn.apache.org/viewvc?rev=1240126&view=rev
Log:
[SCM-656] Building maven-scm-1.6 requires a native install of git.
skip test if git is not in PATH
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java?rev=1240126&r1=1240125&r2=1240126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java Fri Feb 3 12:24:13 2012
@@ -27,7 +27,6 @@ import org.apache.maven.scm.command.chec
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.Os;
import java.io.File;
@@ -51,6 +50,11 @@ public class GitCheckInCommandNoBranchTe
public void testCheckinNoBranch()
throws Exception
{
+ if ( !ScmTestCase.isSystemCmd( "git" ) )
+ {
+ System.out.println( "skip test which git native executable in path" );
+ return;
+ }
File repo_orig = new File( "src/test/resources/repository_no_branch" );
File repo = getTestFile( "target/git_copy" );
FileUtils.deleteDirectory( repo );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java?rev=1240126&r1=1240125&r2=1240126&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java Fri Feb 3 12:24:13 2012
@@ -57,6 +57,11 @@ public class GitExeCheckOutCommandNoBran
public void testCheckoutNoBranch()
throws Exception
{
+ if ( !ScmTestCase.isSystemCmd( "git" ) )
+ {
+ System.out.println( "skip test which git native executable in path" );
+ return;
+ }
CheckOutScmResult result = checkoutRepo();
assertEquals( 0, result.getCheckedOutFiles().size() );
}
@@ -64,6 +69,11 @@ public class GitExeCheckOutCommandNoBran
public void testDoubleCheckoutNoBranch()
throws Exception
{
+ if ( !ScmTestCase.isSystemCmd( "git" ) )
+ {
+ System.out.println( "skip test which git native executable in path" );
+ return;
+ }
CheckOutScmResult result = checkoutRepo();
assertEquals( 0, result.getCheckedOutFiles().size() );
CheckOutScmResult result2 = checkoutRepo();