Commit 06b79416 authored by Andre Heydt's avatar Andre Heydt
Browse files

junit added for makefile

git-svn-id: https://svn.math.tu-berlin.de/svn/jtem@1769 f5b180c5-49ee-4939-b20e-b6ed35f0f7b7
parent 2a1d318a
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/mfc"/>
<classpathentry combineaccessrules="false" kind="src" path="/function"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/mfc"/>
<classpathentry combineaccessrules="false" kind="src" path="/function"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -36,7 +36,8 @@ TESTBINDIR=$(TESTDIR)
#exclude the following tests
EXCLTESTS=
#where to find junit.jar
JUNIT=$(shell locate junit.jar | grep '/junit.jar' | tail --lines=1)
JUNIT=$(wildcard junit*.jar)
JUNITTESTRUNNER =org.junit.runner.JUnitCore
#compile options
JAVACOPTS=-target 1.6 -source 1.6
......@@ -176,7 +177,7 @@ else
@for test in $(TESTS); do \
echo "- JUnitTest: $$test"; \
java -ea -classpath "`find $(LIBDIR) -name '*.jar' -printf %p: 2> /dev/null`$(JUNIT):$(BINDIR):$(TESTBINDIR)" \
junit.textui.TestRunner $$test || { echo "JUnit Test failed!" ; exit 1; } \
$(JUNITTESTRUNNER) $$test || { echo "JUnit Test failed!" ; exit 1; } \
done;
@if [ -n "$(ext_)" ]; then echo "WARNING: some tests where exluded, see variable EXCLTESTS"; fi
......
File added
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment