From: Mark Struberg <struberg@yahoo.de>
To: git@vger.kernel.org, spearce@spearce.org
Cc: Mark Struberg <struberg@yahoo.de>
Subject: [JGIT PATCH 6/9] enable missing test cases and fix jgit executable creation
Date: Wed, 23 Sep 2009 23:16:07 +0200 [thread overview]
Message-ID: <1253740570-10718-6-git-send-email-struberg@yahoo.de> (raw)
In-Reply-To: <1253740570-10718-5-git-send-email-struberg@yahoo.de>
* 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
next prev parent reply other threads:[~2009-09-23 21:16 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-23 21:16 [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de> Mark Struberg
[not found] ` <1253740570-10718-2-git-send-email-struberg@yahoo.de>
2009-09-23 21:16 ` [JGIT PATCH 3/9] moving some license files and META-INF Mark Struberg
2009-09-23 21:16 ` [JGIT PATCH 4/9] checkin all eclipse project file changes Mark Struberg
2009-09-23 21:16 ` [JGIT PATCH 5/9] mavenized org.spearce.jgit.pgm Mark Struberg
2009-09-23 21:16 ` Mark Struberg [this message]
2009-09-23 21:16 ` [JGIT PATCH 7/9] removing eclipse project files Mark Struberg
2009-09-23 21:16 ` [JGIT PATCH 8/9] renamed the PathSuffixFilter test to JUnit conventions, so it gets executed via maven test Mark Struberg
2009-09-23 21:16 ` [JGIT PATCH 9/9] Add the <scm> section to the parent pom Mark Struberg
2009-09-24 6:29 ` [JGIT PATCH 7/9] removing eclipse project files Ferry Huberts
2009-09-24 6:55 ` Mark Struberg
2009-09-24 7:57 ` Ferry Huberts
2009-09-24 8:24 ` Mark Struberg
2009-09-24 8:57 ` Ferry Huberts
2009-09-24 8:57 ` Ferry Huberts
2009-09-25 21:40 ` Robin Rosenberg
2009-09-24 11:24 ` Sohn, Matthias
2009-09-24 11:50 ` Mark Struberg
2009-09-25 13:25 ` Douglas Campos
2009-09-25 21:17 ` Robin Rosenberg
2009-09-26 20:10 ` Mark Struberg
2009-09-27 19:52 ` Robin Rosenberg
2009-09-28 2:21 ` Jonas Fonseca
2009-09-28 6:34 ` Robin Rosenberg
2009-09-28 6:42 ` Robin Rosenberg
2009-09-25 21:33 ` [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de> Robin Rosenberg
2009-09-26 19:50 ` Mark Struberg
2009-09-28 12:46 ` Jonas Fonseca
2009-09-30 19:51 ` Mark Struberg
2009-09-30 21:16 ` Shawn O. Pearce
2009-09-30 23:13 ` Mark Struberg
2009-09-30 23:16 ` Jason van Zyl
2009-10-01 11:15 ` Mark Struberg
2009-10-01 13:55 ` Jason van Zyl
2009-10-01 1:33 ` Jonas Fonseca
2009-10-01 2:05 ` Douglas Campos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1253740570-10718-6-git-send-email-struberg@yahoo.de \
--to=struberg@yahoo.de \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).