Skip to content
Snippets Groups Projects
Commit e1578c8f authored by brinn's avatar brinn
Browse files

add: output of platform 

add: target for test-jar file

SVN: 10397
parent 76b9ec1c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
base/build/build.xml
+ 86
− 52
View file @ e1578c8f
<project name="base" default="jar" basedir=".."> <project name="base" default="dist" basedir="..">
<target name="clean"> <target name="clean">
<delete dir="${dist}" /> <delete dir="${dist}" />
</target> </target>
<import file="../../build_resources/ant/build-common.xml" /> <import file="../../build_resources/ant/build-common.xml" />
<project-classpath name="ecp" classes="${classes}" /> <project-classpath name="ecp" classes="${classes}" />
<property name="mainfolder" value="base" /> <property name="mainfolder" value="base" />
<property name="jar.file" value="${dist}/cisd-base.jar" /> <property name="jar.file" value="${dist}/cisd-base.jar" />
<property name="nativesrc" value="${lib}/unix/native" /> <property name="jar.test.file" value="${dist}/cisd-base-test.jar" />
<property name="nativeroot" value="${targets}/ant" /> <property name="nativesrc" value="${lib}/unix/native" />
<property name="native" value="${nativeroot}/native" /> <property name="nativeroot" value="${targets}/ant" />
<property name="native" value="${nativeroot}/native" />
<property name="dist.common" value="${dist}/${mainfolder}" />
<property name="dist.common.lib" value="${dist.common}/lib" /> <property name="dist.common" value="${dist}/${mainfolder}" />
<property name="dist.common.lib" value="${dist.common}/lib" />
<target name="ci" depends="build-common.ci, check-dependencies" />
<target name="ci" depends="build-common.ci, check-dependencies" />
<target name="jar" depends="compile-tests">
<mkdir dir="${dist.common.lib}" /> <target name="dist" depends="clean, jar" />
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <target name="jar" depends="compile">
<copy todir="${native}"> <mkdir dir="${dist.common.lib}" />
<fileset dir="${nativesrc}"> <build-info revision="revision.number" version="version.number" clean="clean.flag" />
<include name="**/unix.so" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
</fileset> <copy todir="${native}">
</copy> <fileset dir="${nativesrc}">
<recursive-jar destfile="${jar.file}"> <include name="**/unix.so" />
<fileset dir="${classes}"> </fileset>
<include name="**/*.class" /> </copy>
<include name="${build.info.filename}" /> <recursive-jar destfile="${jar.file}">
</fileset> <fileset dir="${classes}">
<fileset dir="${nativeroot}"> <include name="**/*.class" />
<include name="**/unix.so" /> <include name="${build.info.filename}" />
</fileset> </fileset>
<manifest> <fileset dir="${nativeroot}">
<attribute name="Main-Class" value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" /> <include name="**/unix.so" />
<attribute name="Version" value="${version.number}" /> </fileset>
<attribute name="Build-Number" <manifest>
value="${version.number} (r${revision.number},${clean.flag})" /> <attribute name="Main-Class"
</manifest> value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" />
</recursive-jar> <attribute name="Version" value="${version.number}" />
</target> <attribute name="Build-Number"
value="${version.number} (r${revision.number},${clean.flag})" />
<!-- </manifest>
</recursive-jar>
</target>
<target name="jar-test" depends="compile-tests">
<mkdir dir="${dist.common.lib}" />
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
<copy todir="${native}">
<fileset dir="${nativesrc}">
<include name="**/unix.so" />
</fileset>
</copy>
<recursive-jar destfile="${jar.test.file}">
<fileset dir="${classes}">
<include name="**/*.class" />
<include name="${build.info.filename}" />
</fileset>
<fileset dir="${nativeroot}">
<include name="**/unix.so" />
</fileset>
<zipfileset src="${lib}/testng/testng-jdk15.jar" />
<zipfileset src="${lib}/commons-lang/commons-lang.jar" />
<zipfileset src="${lib}/commons-io/commons-io.jar" />
<manifest>
<attribute name="Main-Class"
value="ch.systemsx.cisd.base.unix.UnixTests" />
<attribute name="Version" value="${version.number}" />
<attribute name="Build-Number"
value="${version.number} (r${revision.number},${clean.flag})" />
</manifest>
</recursive-jar>
</target>
<!--
// Runs the test suite 'tests.xml'. // Runs the test suite 'tests.xml'.
--> -->
<target name="run-tests" description="Runs the test suite 'tests.xml'."> <target name="run-tests" description="Runs the test suite 'tests.xml'.">
<antcall target="build-common.run-tests"> <antcall target="build-common.run-tests">
<param name="test.suite" value="tests.xml" /> <param name="test.suite" value="tests.xml" />
</antcall> </antcall>
</target> </target>
</project> </project>
\ No newline at end of file
base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+ 3
− 0
View file @ e1578c8f
...@@ -35,6 +35,7 @@ import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase; ...@@ -35,6 +35,7 @@ import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
import ch.systemsx.cisd.base.unix.Unix.Group; import ch.systemsx.cisd.base.unix.Unix.Group;
import ch.systemsx.cisd.base.unix.Unix.Password; import ch.systemsx.cisd.base.unix.Unix.Password;
import ch.systemsx.cisd.base.unix.Unix.Stat; import ch.systemsx.cisd.base.unix.Unix.Stat;
import ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo;
/** /**
* Test cases for the {@link Unix} system calls. * Test cases for the {@link Unix} system calls.
...@@ -276,6 +277,8 @@ public class UnixTests extends AbstractFileSystemTestCase ...@@ -276,6 +277,8 @@ public class UnixTests extends AbstractFileSystemTestCase
public static void main(String[] args) throws Throwable public static void main(String[] args) throws Throwable
{ {
System.out.println(BuildAndEnvironmentInfo.INSTANCE);
System.out.println();
final UnixTests test = new UnixTests(); final UnixTests test = new UnixTests();
try try
{ {
......
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