diff options
| author | Sven Gothel <[email protected]> | 2020-01-02 05:44:50 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2020-01-02 05:44:50 +0100 |
| commit | 51e73653a35bd041384f201090b49ff601e4a5e7 (patch) | |
| tree | 880408bf4b28e8d28ac4386db2d2f490aa56c0b8 /make | |
| parent | a4eb7f17f871ded72163c649be403ccad38a6669 (diff) | |
Handle special junit treatment via make/lib/gluegen-cpptasks* (i.e. iOS)
Otherwise the build won't produce dummy junit test results for jenkins etc.
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 4 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-ios-aarch64.xml | 3 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-ios-amd64.xml | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index 1dc6595..f147f3d 100644 --- a/make/build.xml +++ b/make/build.xml @@ -1275,11 +1275,11 @@ <echo message='gluegen.build.sha.natives=${gluegen.build.sha.natives}${line.separator}' file="${build}/artifact.properties" append="true"/> </target> - <target name="junit.compile" depends="init" if="${build.dynamiclibs}"> + <target name="junit.compile" depends="init"> <ant antfile="build-test.xml" target="junit.compile"/> </target> - <target name="junit.run" depends="init,junit.compile" if="${build.dynamiclibs}"> + <target name="junit.run" depends="init,junit.compile"> <ant antfile="build-test.xml" target="junit.run"/> </target> diff --git a/make/lib/gluegen-cpptasks-ios-aarch64.xml b/make/lib/gluegen-cpptasks-ios-aarch64.xml index 389f791..fc6aa6a 100644 --- a/make/lib/gluegen-cpptasks-ios-aarch64.xml +++ b/make/lib/gluegen-cpptasks-ios-aarch64.xml @@ -5,6 +5,9 @@ <!-- Only set 'isIOSArm64' then continue via default task 'gluegen.cpptasks.detect.os.1' etc --> <target name="gluegen.cpptasks.detect.os.custom"> <property name="isIOSArm64" value="true" /> + <property name="junit.is.disabled" value="true" /> + <property name="junit.compile.skip" value="true" /> + <property name="test.compile.skip" value="true" /> <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-ios-aarch64' done"/> </target> diff --git a/make/lib/gluegen-cpptasks-ios-amd64.xml b/make/lib/gluegen-cpptasks-ios-amd64.xml index 729977d..3f7f802 100644 --- a/make/lib/gluegen-cpptasks-ios-amd64.xml +++ b/make/lib/gluegen-cpptasks-ios-amd64.xml @@ -5,6 +5,9 @@ <!-- Only set 'isIOSAmd64' then continue via default task 'gluegen.cpptasks.detect.os.1' etc --> <target name="gluegen.cpptasks.detect.os.custom"> <property name="isIOSAmd64" value="true" /> + <property name="junit.is.disabled" value="true" /> + <property name="junit.compile.skip" value="true" /> + <property name="test.compile.skip" value="true" /> <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-ios-amd64' done"/> </target> |