Commit 76d036c5 authored by earplov's avatar earplov
Browse files

Merge branch 'master' of https://github.com/alovassy/titan.core

parents 59290771 e92ca201
###############################################################################
# Copyright (c) 2000-2015 Ericsson Telecom AB
# Copyright (c) 2000-2016 Ericsson Telecom AB
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
# Creates C++ header from the Java code for Java to C++ JNI calls.
# Creates C++ header from the Java code for Java to C++ JNI function calls.
# This must run if any of the native Java methods change (in org.eclipse.titan.executor.jni.JNIMiddleWare).
# A C++ function header is generated for each native Java method.
# Native Java method: declared with native keyword without implementation
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright (c) 2000-2015 Ericsson Telecom AB
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
Copyright (c) 2000-2016 Ericsson Telecom AB
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Janos Zoltan Szabo – initial implementation
-->
<project basedir="." default="build" name="TITAN_Executor_API_test">
<property environment="env"/>
<property name="LIB" value="../../../titan_playground/jar"/>
<property name="junit.output.dir" value="junit"/>
<property name="TITAN_Executor_API.location" value="../TITAN_Executor_API"/>
<property name="debuglevel" value="source,lines,vars"/>
<property name="target" value="1.7"/>
<property name="source" value="1.7"/>
<path id="JUnit 4.libraryclasspath">
<pathelement location="${LIB}/org.junit_4.11.0.v201303080030/junit.jar"/>
<pathelement location="${LIB}/org.hamcrest.core_1.3.0.v201303031735.jar"/>
<pathelement location="${junit.full}"/>
<pathelement location="${hamcrest.full}"/>
</path>
<path id="TITAN_Executor_API.classpath">
<pathelement location="${TITAN_Executor_API.location}/bin"/>
......
###############################################################################
# Copyright (c) 2000-2015 Ericsson Telecom AB
# Copyright (c) 2000-2016 Ericsson Telecom AB
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# Janos Zoltan Szabo – initial implementation
#
###############################################################################
# EDIT THESE LINES TO SET CORRECT JAR LOCATIONS
LIB_DIR_GIT=$HOME/git/titan_playground/jar
# short file name
JUNIT_JAR=junit.jar
HAMCREST_JAR=org.hamcrest.core_1.3.0.v201303031735.jar
# full path
JUNIT_FULL=${LIB_DIR_GIT}/org.junit_4.11.0.v201303080030/${JUNIT_JAR}
HAMCREST_FULL=${LIB_DIR_GIT}/${HAMCREST_JAR}
JUNIT_FULL=$HOME/lib/org.junit_4.11.0.v201303080030/junit.jar
HAMCREST_FULL=$HOME/lib/org.hamcrest.core_1.3.0.v201303031735.jar
#---------------------------------------------------------------------
# DO NOT EDIT AFTER THIS LINE
......@@ -77,6 +74,7 @@ file_exist ${HAMCREST_FULL}
# run test (and build its dependencies if needed)
ant \
-lib ${JUNIT_FULL} \
-lib ${HAMCREST_FULL} \
-Djunit.full=${JUNIT_FULL} \
-Dhamcrest.full=${HAMCREST_FULL} \
TITAN_Executor_API_test
......@@ -10,7 +10,7 @@
build.xml is generated.
The generated build.xml is modified manually:
target TITAN_Executor_API_test is modified to fail in ant level if any testcase fails to make Jenkins show the failures
target TITAN_Executor_API_test is modified to fail in ant level if any testcase fails, to make Jenkins show the failures
failureproperty="test.failed" added to <junit fork="yes" printsummary="withOutAndErr" HERE>
<fail if="test.failed" message="TITAN_Executor_API_test FAILED"/> added after </junit>
......
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