[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21965 - gnunet-java/tools
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21965 - gnunet-java/tools |
Date: |
Wed, 13 Jun 2012 15:00:13 +0200 |
Author: dold
Date: 2012-06-13 15:00:13 +0200 (Wed, 13 Jun 2012)
New Revision: 21965
Modified:
gnunet-java/tools/build
gnunet-java/tools/coverage
Log:
fix
Modified: gnunet-java/tools/build
===================================================================
--- gnunet-java/tools/build 2012-06-13 12:41:21 UTC (rev 21964)
+++ gnunet-java/tools/build 2012-06-13 13:00:13 UTC (rev 21965)
@@ -3,11 +3,23 @@
# environment variables:
# $JFLAGS: additional flags passed to the java compiler
+
+
BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
# collect all source files
-SOURCES=`find "$BASEDIR/src/" "$BASEDIR/test/" -name "*.java"`
+if [ "$GNJ_NO_TESTS" = "true" ]
+then
+ echo "building without tests"
+ SOURCES=`find "$BASEDIR/src/" -name "*.java"`
+else
+ echo "building with tests"
+ SOURCES=`find "$BASEDIR/src/" "$BASEDIR/test/" -name "*.java"`
+fi
+
+
+
mkdir -p $BASEDIR/build
javac -g $JFLAGS -cp "$BASEDIR/build/:$BASEDIR/lib/*" -d $BASEDIR/build/
$SOURCES || exit 1
Modified: gnunet-java/tools/coverage
===================================================================
--- gnunet-java/tools/coverage 2012-06-13 12:41:21 UTC (rev 21964)
+++ gnunet-java/tools/coverage 2012-06-13 13:00:13 UTC (rev 21965)
@@ -2,18 +2,21 @@
BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
-INSTRUMENT_CMD="sh $BASEDIR/cobertura/cobertura-instrument.sh --datafile
$BASEDIR/coverage.data --destination $BASEDIR/build-instrumented --ignore
.*assert.* "
+INSTRUMENT_CMD="sh $BASEDIR/cobertura/cobertura-instrument.sh --datafile
$BASEDIR/coverage.data --destination $BASEDIR/build-instrumented --ignore
assert "
+echo $INSTRUMENT_CMD
+
case "$1" in
instrument)
cp -r "$BASEDIR/build/" "$BASEDIR/build-instrumented/"
- find $BASEDIR/build/ -name *.class | xargs $INSTRUMENT_CMD
+ find $BASEDIR/build/ -name *.class | grep -v .*Test.* | xargs
$INSTRUMENT_CMD
;;
clean)
rm -r $BASEDIR/build-instrumented &>/dev/null
rm $BASEDIR/coverage.data &>/dev/null
rm -r $BASEDIR/coverage-report &>/dev/null
+ exit 0
;;
report)
sh $BASEDIR/cobertura/cobertura-report.sh --destination
$BASEDIR/coverage-report --datafile $BASEDIR/coverage.data $BASEDIR/src/
$BASEDIR/test/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21965 - gnunet-java/tools,
gnunet <=