[jel] 01/01: Simplify CI test setup

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository jel.

commit d212f987412976ff9c0246a0521c8f9afc80f8d3
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Feb 22 13:08:21 2017 +0100

    Simplify CI test setup
---
 debian/tests/control                     | 2 +-
 debian/tests/jel-test                    | 9 ---------
 debian/tests/{build.xml => jel-test.xml} | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 9f04f07..20b4731 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
-Tests: jel-test
+Tests: ant test -f debian/tests/jel-test.xml -Dbuild.dir=$ADTTMP
 Depends: jel-java,
          ant, ant-optional, default-jdk, junit
diff --git a/debian/tests/jel-test b/debian/tests/jel-test
deleted file mode 100755
index b9f4e7d..0000000
--- a/debian/tests/jel-test
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -rf ${ADTTMP}/*
-cp -a debian/tests/build.xml source/src/tests ${ADTTMP}
-cd ${ADTTMP}
-
-ant test -Djava.awt.headless=True
diff --git a/debian/tests/build.xml b/debian/tests/jel-test.xml
similarity index 97%
rename from debian/tests/build.xml
rename to debian/tests/jel-test.xml
index 0a0d99a..5dd92f5 100644
--- a/debian/tests/build.xml
+++ b/debian/tests/jel-test.xml
@@ -3,7 +3,7 @@
 <project name="JEL CI tests" default="test" basedir=".">
   
   <property name="build.dir" value="build"/>
-  <property name="src.dir" value="."/>
+  <property name="src.dir" value="../../source/src"/>
   <property name="build.tests" value="${build.dir}/tests"/>
   <property name="tests.dir" value="${src.dir}/tests"/>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/jel.git