diff --git a/test/codegen/.classpath b/test/codegen/.classpath
index 935e0115c9d124ff01d1b36f915ea201c320c77c..974f5c8ab1318c7da42c4d162da62d1df57bdf4f 100644
--- a/test/codegen/.classpath
+++ b/test/codegen/.classpath
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/genjava"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="lib" path="/com.amd.aparapi/dist/aparapi.jar" sourcepath="/com.amd.aparapi">
- <attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.amd.aparapi.jni/dist"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/genjava"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/com.amd.aparapi/dist/aparapi.jar" sourcepath="/com.amd.aparapi">
+ <attributes>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.amd.aparapi.jni/dist"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path=".libs/junit-4.10.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
diff --git a/test/codegen/.gitignore b/test/codegen/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c59924d52fa0a01075d03be09a723df6abbf275f
--- /dev/null
+++ b/test/codegen/.gitignore
@@ -0,0 +1,3 @@
+/.libs/
+/classes/
+/junit/
diff --git a/test/codegen/build.xml b/test/codegen/build.xml
index 7af1dcebeb736a71b18128d972d55277d88a2fb4..c41e58c87b6af5f3b9fca28e17bf531e821647d0 100644
--- a/test/codegen/build.xml
+++ b/test/codegen/build.xml
@@ -1,93 +1,85 @@
<?xml version="1.0"?>
-<project name="codegen" default="junit" basedir=".">
+<project name="test-codegen" default="junit" basedir=".">
- <!--
+ <!--
USER CONFIGURABLE PROPERTIES
- -->
- <property name="junit.jar.version" value="4.10"/>
- <property name="junit.jar.name" value="junit-${junit.jar.version}.jar"/>
- <property name="junit.home" value="${basedir}/.libs"/>
- <property name="junit.base.url" value="http://repo1.maven.org/maven2/junit/junit"/>
-
- <!--
+ -->
+ <property name="junit.jar.version" value="4.10" />
+ <property name="junit.jar.name" value="junit-${junit.jar.version}.jar" />
+ <property name="junit.home" value="${basedir}/.libs" />
+ <property name="junit.base.url" value="http://repo1.maven.org/maven2/junit/junit" />
+
+ <!--
DO NOT EDIT BELOW THIS LINE
-->
- <echo>OS Name: ${os.name}</echo>
- <echo>OS Version: ${os.version}</echo>
- <echo>OS Arch: ${os.arch}</echo>
+ <echo>OS Name: ${os.name}</echo>
+ <echo>OS Version: ${os.version}</echo>
+ <echo>OS Arch: ${os.arch}</echo>
+
+ <!-- Ideally this would be the latest version of Java but not everyone is going to have it installed -->
+ <!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) -->
+ <property name="build.compiler" value="javac1.7" />
+ <property name="ant.build.javac.source" value="1.7" />
+ <property name="ant.build.javac.target" value="1.7" />
- <property name="build.compiler" value="javac1.6"/>
- <property name="ant.build.javac.source" value="1.6"/>
- <property name="ant.build.javac.target" value="1.6"/>
-
- <available property="junit.installed" file="${junit.home}/${junit.jar.name}"/>
+ <available property="junit.installed" file="${junit.home}/${junit.jar.name}" />
+
+ <target name="install.deps" unless="junit.installed">
+ <mkdir dir="${junit.home}" />
+ <!-- Cleanup all existing JUnit installations -->
+ <delete failonerror="false" includeEmptyDirs="true">
+ <fileset dir="${junit.home}" includes="junit*/" />
+ </delete>
+ <!-- Download and unzip requested JUnit version -->
+ <get src="${junit.base.url}/${junit.jar.version}/${junit.jar.name}" dest="${junit.home}" />
+ </target>
- <target name="install.junit" unless="junit.installed">
- <mkdir dir="${junit.home}"/>
- <!-- Cleanup all existing JUnit installations -->
- <delete failonerror="false" includeEmptyDirs="true">
- <fileset dir="${junit.home}" includes="junit*/"/>
- </delete>
- <!-- Download and unzip requested JUnit version -->
- <get src="${junit.base.url}/${junit.jar.version}/${junit.jar.name}" dest="${junit.home}"/>
+ <target name="clean">
+ <delete dir="classes" />
+ <delete dir="junit" />
+ <delete dir="src/genjava/com" />
+ <!-- Legacy cleanup -->
+ <delete file="junit*.jar" />
</target>
-
- <target name="clean">
- <delete dir="classes"/>
- <delete dir="junit"/>
- <delete dir="src/genjava/com"/>
- <!-- Legacy cleanup -->
- <delete file="junit*.jar"/>
- </target>
- <path id="classpath">
- <pathelement path="${basedir}/../../com.amd.aparapi/dist/aparapi.jar"/>
- <pathelement path="${junit.home}/${junit.jar.name}"/>
- <pathelement path="classes"/>
- </path>
-
- <target name="junit" depends="clean, install.junit">
- <mkdir dir="classes"/>
- <javac debug="true"
- debuglevel="lines,vars,source"
- srcdir="src/java"
- destdir="classes"
- includeAntRuntime="false"
- classpathref="classpath">
- <compilerarg value="-Xlint"/>
- <compilerarg value="-Xlint:-path"/>
- </javac>
+ <path id="classpath">
+ <pathelement path="${basedir}/../../com.amd.aparapi/dist/aparapi.jar" />
+ <pathelement path="${junit.home}/${junit.jar.name}" />
+ <pathelement path="classes" />
+ </path>
- <java classname="com.amd.aparapi.CreateJUnitTests" classpathref="classpath">
- <sysproperty key="root" value="${basedir}"/>
- </java>
+ <target name="junit" depends="clean, install.deps">
+ <mkdir dir="classes" />
+ <javac debug="true" debuglevel="lines,vars,source" srcdir="src/java" destdir="classes" includeAntRuntime="false" classpathref="classpath">
+ <compilerarg value="-Xlint" />
+ <compilerarg value="-Xlint:-path" />
+ </javac>
- <javac debug="true"
- debuglevel="lines,vars,source"
- srcdir="src/genjava"
- destdir="classes"
- includeAntRuntime="false"
- classpathref="classpath">
- <compilerarg value="-Xlint"/>
- <compilerarg value="-Xlint:-path"/>
- </javac>
-
- <mkdir dir="junit"/>
- <mkdir dir="junit/data"/>
-
- <junit printsummary="false" fork="false" haltonfailure="false" failureproperty="tests.failed" showoutput="false">
- <formatter type="xml" />
- <classpath refid="classpath"/>
- <batchtest todir="junit/data">
- <fileset dir="src/genjava"/>
- </batchtest>
- </junit>
+ <java classname="com.amd.aparapi.CreateJUnitTests" classpathref="classpath">
+ <sysproperty key="root" value="${basedir}" />
+ </java>
- <junitreport todir="junit/data">
- <fileset dir="junit/data"/>
- <report format="frames" todir="junit/html" />
- </junitreport>
- </target>
+ <javac debug="true" debuglevel="lines,vars,source" srcdir="src/genjava" destdir="classes" includeAntRuntime="false" classpathref="classpath">
+ <compilerarg value="-Xlint" />
+ <compilerarg value="-Xlint:-path" />
+ </javac>
+
+ <mkdir dir="junit" />
+ <mkdir dir="junit/data" />
+
+ <junit printsummary="false" fork="false" haltonfailure="false" failureproperty="tests.failed" showoutput="false">
+ <formatter type="xml" />
+ <classpath refid="classpath" />
+ <batchtest todir="junit/data">
+ <fileset dir="src/genjava" />
+ </batchtest>
+ </junit>
+
+ <junitreport todir="junit/data">
+ <fileset dir="junit/data" />
+ <report format="frames" todir="junit/html" />
+ </junitreport>
+ </target>
</project>
diff --git a/test/codegen/src/.gitignore b/test/codegen/src/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f8bfb8460d8336bbed65cdde9e0caf440bca2fa5
--- /dev/null
+++ b/test/codegen/src/.gitignore
@@ -0,0 +1 @@
+/genjava/
diff --git a/test/runtime/.classpath b/test/runtime/.classpath
index 168c15f2da68a1d23e278cf8a4000544c4baf77a..e61260c1e4ce839688a2de77b8401f692a3248f0 100644
--- a/test/runtime/.classpath
+++ b/test/runtime/.classpath
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="lib" path="/com.amd.aparapi/dist/aparapi.jar" sourcepath="/com.amd.aparapi">
- <attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.amd.aparapi.jni/dist"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/com.amd.aparapi/dist/aparapi.jar" sourcepath="/com.amd.aparapi">
+ <attributes>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.amd.aparapi.jni/dist"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path=".libs/junit-4.10.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
diff --git a/test/runtime/.gitignore b/test/runtime/.gitignore
index 840e7d3120ee3206168d49bf62df2c269c38e17e..6d97f11be2e96e766a69fc1d3369cb3305ebce86 100644
--- a/test/runtime/.gitignore
+++ b/test/runtime/.gitignore
@@ -1 +1,3 @@
/classes/
+/.libs/
+/junit/
diff --git a/test/runtime/build.xml b/test/runtime/build.xml
index aab11bb5041f1c19ebe8a7ff8e5e6e73041ba757..e4c7b8261fb037e60d6c4be607b2306353d60635 100644
--- a/test/runtime/build.xml
+++ b/test/runtime/build.xml
@@ -1,83 +1,80 @@
<?xml version="1.0"?>
-<project name="codegen" default="junit" basedir=".">
+<project name="test-runtime" default="junit" basedir=".">
- <!--
+ <!--
USER CONFIGURABLE PROPERTIES
- -->
- <property name="junit.jar.version" value="4.10"/>
- <property name="junit.jar.name" value="junit-${junit.jar.version}.jar"/>
- <property name="junit.home" value="${basedir}/.libs"/>
- <property name="junit.base.url" value="http://repo1.maven.org/maven2/junit/junit"/>
+ -->
+ <property name="junit.jar.version" value="4.10" />
+ <property name="junit.jar.name" value="junit-${junit.jar.version}.jar" />
+ <property name="junit.home" value="${basedir}/.libs" />
+ <property name="junit.base.url" value="http://repo1.maven.org/maven2/junit/junit" />
- <!--
+ <!--
DO NOT EDIT BELOW THIS LINE
-->
- <echo>OS Name: ${os.name}</echo>
- <echo>OS Version: ${os.version}</echo>
- <echo>OS Arch: ${os.arch}</echo>
+ <echo>OS Name: ${os.name}</echo>
+ <echo>OS Version: ${os.version}</echo>
+ <echo>OS Arch: ${os.arch}</echo>
+
+ <!-- Ideally this would be the latest version of Java but not everyone is going to have it installed -->
+ <!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) -->
+ <property name="build.compiler" value="javac1.7" />
+ <property name="ant.build.javac.source" value="1.7" />
+ <property name="ant.build.javac.target" value="1.7" />
- <property name="build.compiler" value="javac1.6"/>
- <property name="ant.build.javac.source" value="1.6"/>
- <property name="ant.build.javac.target" value="1.6"/>
+ <available property="junit.installed" file="${junit.home}/${junit.jar.name}" />
- <available property="junit.installed" file="${junit.home}/${junit.jar.name}"/>
+ <target name="install.deps" unless="junit.installed">
+ <mkdir dir="${junit.home}" />
+ <!-- Cleanup all existing JUnit installations -->
+ <delete failonerror="false" includeEmptyDirs="true">
+ <fileset dir="${junit.home}" includes="junit*/" />
+ </delete>
+ <!-- Download and unzip requested JUnit version -->
+ <get src="${junit.base.url}/${junit.jar.version}/${junit.jar.name}" dest="${junit.home}" />
+ </target>
- <target name="install.junit" unless="junit.installed">
- <mkdir dir="${junit.home}"/>
- <!-- Cleanup all existing JUnit installations -->
- <delete failonerror="false" includeEmptyDirs="true">
- <fileset dir="${junit.home}" includes="junit*/"/>
- </delete>
- <!-- Download and unzip requested JUnit version -->
- <get src="${junit.base.url}/${junit.jar.version}/${junit.jar.name}" dest="${junit.home}"/>
- </target>
+ <target name="clean">
+ <delete dir="classes" />
+ <delete dir="junit" />
+ <!-- Legacy cleanup -->
+ <delete file="junit*.jar" />
+ </target>
- <target name="clean">
- <delete dir="classes"/>
- <delete dir="junit"/>
- <!-- Legacy cleanup -->
- <delete file="junit*.jar"/>
- </target>
+ <path id="classpath">
+ <pathelement path="${basedir}/../../com.amd.aparapi/dist/aparapi.jar" />
+ <pathelement path="${junit.home}/${junit.jar.name}" />
+ <pathelement path="classes" />
+ </path>
- <path id="classpath">
- <pathelement path="${basedir}/../../com.amd.aparapi/dist/aparapi.jar"/>
- <pathelement path="${junit.home}/${junit.jar.name}"/>
- <pathelement path="classes"/>
- </path>
+ <target name="junit" depends="clean, install.deps">
+ <mkdir dir="classes" />
+ <javac debug="true" debuglevel="lines,vars,source" srcdir="src/java" destdir="classes" includeAntRuntime="false" classpathref="classpath">
+ <compilerarg value="-Xlint" />
+ <compilerarg value="-Xlint:-path" />
+ </javac>
- <target name="junit" depends="clean, install.junit">
- <mkdir dir="classes"/>
- <javac debug="true"
- debuglevel="lines,vars,source"
- srcdir="src/java"
- destdir="classes"
- includeAntRuntime="false"
- classpathref="classpath">
- <compilerarg value="-Xlint"/>
- <compilerarg value="-Xlint:-path"/>
- </javac>
-
- <copy todir="classes/com/amd/aparapi/test/runtime" file="src/java/com/amd/aparapi/test/runtime/squarer.cl"/>
+ <copy todir="classes/com/amd/aparapi/test/runtime" file="src/java/com/amd/aparapi/test/runtime/squarer.cl" />
- <mkdir dir="junit"/>
- <mkdir dir="junit/data"/>
+ <mkdir dir="junit" />
+ <mkdir dir="junit/data" />
- <!-- even though fork is slower we need to set the library path and this requires fork -->
+ <!-- even though fork is slower we need to set the library path and this requires fork -->
- <junit printsummary="false" fork="true" haltonfailure="false" failureproperty="tests.failed" showoutput="false">
- <sysproperty key="java.library.path" value="${basedir}/../../com.amd.aparapi.jni/dist"/>
- <formatter type="xml" />
- <classpath refid="classpath"/>
- <batchtest todir="junit/data">
- <fileset dir="src\java"/>
- </batchtest>
- </junit>
+ <junit printsummary="false" fork="true" haltonfailure="false" failureproperty="tests.failed" showoutput="false">
+ <sysproperty key="java.library.path" value="${basedir}/../../com.amd.aparapi.jni/dist" />
+ <formatter type="xml" />
+ <classpath refid="classpath" />
+ <batchtest todir="junit/data">
+ <fileset dir="src\java" />
+ </batchtest>
+ </junit>
- <junitreport todir="junit/data">
- <fileset dir="junit/data"/>
- <report format="frames" todir="junit/html" />
- </junitreport>
- </target>
+ <junitreport todir="junit/data">
+ <fileset dir="junit/data" />
+ <report format="frames" todir="junit/html" />
+ </junitreport>
+ </target>
</project>