[JGIT PATCH 6/9] enable missing test cases and fix jgit executable creation
* enable the T000* tests in surefire
* fix the creation of the jgit executable by correcting the
use_self filtering and performing the copy task in binary mode
Signed-off-by: Mark Struberg <struberg@yahoo.de>
---
org.spearce.jgit.pgm/jgit.sh | 2 +-
org.spearce.jgit.pgm/pom.xml | 12 +++++++++---
org.spearce.jgit/pom.xml | 5 +++++
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/org.spearce.jgit.pgm/jgit.sh b/org.spearce.jgit.pgm/jgit.sh
index 5e44356..6c101a0 100755
--- a/org.spearce.jgit.pgm/jgit.sh
+++ b/org.spearce.jgit.pgm/jgit.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ "@@use_self@@" = "1" ]
+if [ "@use_self@" = "1" ]
then
this_script=`which "$0" 2>/dev/null`
[ $? -gt 0 -a -f "$0" ] && this_script="$0"
diff --git a/org.spearce.jgit.pgm/pom.xml b/org.spearce.jgit.pgm/pom.xml
index ab399e5..47dfbf1 100644
--- a/org.spearce.jgit.pgm/pom.xml
+++ b/org.spearce.jgit.pgm/pom.xml
@@ -102,11 +102,17 @@
<phase>package</phase>
<configuration>
<tasks>
- <concat destfile="${basedir}/jgit" force="no">
- <fileset file="${basedir}/jgit.sh" />
+ <copy todir="${basedir}/target/">
+ <fileset file="${basedir}/jgit.sh"/>
+ <filterset>
+ <filter token="use_self" value="1"/>
+ </filterset>
+ </copy>
+ <concat destfile="${basedir}/target/jgit" force="yes" binary="true">
+ <fileset file="${basedir}/target/jgit.sh" />
<fileset file="${basedir}/target/jgit-cli.jar" />
</concat>
- <chmod file="${basedir}/jgit" perm="a+x"/>
+ <chmod file="${basedir}/target/jgit" perm="a+x"/>
</tasks>
</configuration>
<goals>
diff --git a/org.spearce.jgit/pom.xml b/org.spearce.jgit/pom.xml
index eb01e16..f565dda 100644
--- a/org.spearce.jgit/pom.xml
+++ b/org.spearce.jgit/pom.xml
@@ -107,6 +107,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/T00*.java</include>
+ </includes>
<excludes>
<exclude>**/*TckTest.java</exclude>
</excludes>
@@ -125,6 +129,7 @@
<configuration>
<includes>
<include>**/*Test.java</include>
+ <include>**/T00*.java</include>
</includes>
</configuration>
</plugin>
--
1.6.2.5
Mark Struberg <struberg@yahoo.de>