Skip to content

Commit

Permalink
Enable Dacapo for All Platforms
Browse files Browse the repository at this point in the history 
- Expanded coverage from xLinux to all platforms
- Added support for zOS

Issue: adoptium#1457

Signed-off-by: Piyush Gupta <piyush286@gmail.com>
  • Loading branch information
@piyush286
piyush286 committed Nov 22, 2019
1 parent 454f7e3 commit 59e0839
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
18 changes: 13 additions & 5 deletions perf/dacapo/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,26 @@

<project name="Dacapo suite" default="build" basedir=".">
<taskdef resource="net/sf/antcontrib/antlib.xml" />
<description>Dacapo suite</description>
<description>Dacapo Suite</description>

<!-- set global properties for this build -->
<!-- Set global properties for this build -->
<property name="DEST" value="${BUILD_ROOT}/perf/dacapo" />
<property name="src" location="." />
<property name="SRC" location="." />

<condition property="isZOS" value="true">
<equals arg1="${os.name}" arg2="z/OS"/>
</condition>

<condition property="git-prefix" value="git" else="https">
<isset property="isZOS"/>
</condition>

<target name="init">
<mkdir dir="${DEST}" />
</target>

<target name="getDacapoSuite" depends="init">
<var name="curl_options" value="-Lks https://sourceforge.net/projects/dacapobench/files/latest/download -o dacapo.jar"/>
<var name="curl_options" value="-Lks ${git-prefix}://sourceforge.net/projects/dacapobench/files/latest/download -o dacapo.jar"/>
<echo message="curl ${curl_options}" />
<exec executable="curl" failonerror="true">
<arg line="${curl_options}" />
Expand All @@ -36,7 +44,7 @@

<target name="dist" depends="getDacapoSuite" description="generate the distribution">
<copy todir="${DEST}">
<fileset dir="${src}"/>
<fileset dir="${SRC}"/>
</copy>
</target>

Expand Down
11 changes: 0 additions & 11 deletions perf/dacapo/playlist.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<testCaseName>dacapo-eclipse</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) eclipse; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<subsets>
<subset>8</subset>
</subsets>
Expand All @@ -33,7 +32,6 @@
<testCaseName>dacapo-avrora</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) avrora; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>extended</level>
</levels>
Expand All @@ -45,7 +43,6 @@
<testCaseName>dacapo-fop</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) fop; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>extended</level>
</levels>
Expand All @@ -57,7 +54,6 @@
<testCaseName>dacapo-h2</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) h2; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>sanity</level>
</levels>
Expand All @@ -69,7 +65,6 @@
<testCaseName>dacapo-jython</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) jython; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>extended</level>
</levels>
Expand All @@ -81,7 +76,6 @@
<testCaseName>dacapo-luindex</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) luindex; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>extended</level>
</levels>
Expand All @@ -93,7 +87,6 @@
<testCaseName>dacapo-lusearch-fix</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) lusearch-fix; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>sanity</level>
</levels>
Expand All @@ -105,7 +98,6 @@
<testCaseName>dacapo-pmd</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) pmd; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>extended</level>
</levels>
Expand All @@ -117,7 +109,6 @@
<testCaseName>dacapo-sunflow</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) sunflow; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>extended</level>
</levels>
Expand All @@ -129,7 +120,6 @@
<testCaseName>dacapo-tomcat</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) tomcat; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>extended</level>
</levels>
Expand All @@ -142,7 +132,6 @@
<testCaseName>dacapo-xalan</testCaseName>
<command>$(JAVA_COMMAND) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) xalan; \
$(TEST_STATUS)</command>
<platformRequirements>os.linux,arch.x86,bits.64</platformRequirements>
<levels>
<level>extended</level>
</levels>
Expand Down

0 comments on commit 59e0839

Please sign in to comment.