make/build.xml

*** 522,542 ****
    </target>
  
    <!-- only to be invoked as dependency of "test" target -->
    <target name="-test-classes-all" depends="jar" unless="test.class">
        <fileset id="test.classes" dir="${build.test.classes.dir}">
-           <include name="**/dynalink/test/*Test.class"/>
            <include name="**/dynalink/beans/test/*Test.class"/>
            <include name="**/api/javaaccess/test/*Test.class"/>
            <include name="**/api/scripting/test/*Test.class"/>
            <include name="**/api/tree/test/*Test.class"/>
            <include name="**/codegen/test/*Test.class"/>
            <include name="**/parser/test/*Test.class"/>
            <include name="**/runtime/test/*Test.class"/>
            <include name="**/runtime/regexp/test/*Test.class"/>
            <include name="**/runtime/regexp/joni/test/*Test.class"/>
-           <include name="**/runtime/doubleconv/test/*Test.class"/>
            <include name="**/framework/*Test.class"/>
       </fileset>
    </target>
  
    <!-- only to be invoked as dependency of "test" target -->
--- 522,544 ----
    </target>
  
    <!-- only to be invoked as dependency of "test" target -->
    <target name="-test-classes-all" depends="jar" unless="test.class">
        <fileset id="test.classes" dir="${build.test.classes.dir}">
            <include name="**/dynalink/beans/test/*Test.class"/>
+           <include name="**/dynalink/linker/support/test/*Test.class"/>
+           <include name="**/dynalink/support/test/*Test.class"/>
+           <include name="**/dynalink/test/*Test.class"/>
            <include name="**/api/javaaccess/test/*Test.class"/>
            <include name="**/api/scripting/test/*Test.class"/>
            <include name="**/api/tree/test/*Test.class"/>
            <include name="**/codegen/test/*Test.class"/>
            <include name="**/parser/test/*Test.class"/>
            <include name="**/runtime/test/*Test.class"/>
+           <include name="**/runtime/doubleconv/test/*Test.class"/>
            <include name="**/runtime/regexp/test/*Test.class"/>
            <include name="**/runtime/regexp/joni/test/*Test.class"/>
            <include name="**/framework/*Test.class"/>
       </fileset>
    </target>
  
    <!-- only to be invoked as dependency of "test" target -->
*** 548,557 ****
--- 550,560 ----
  
    <!-- only to be invoked as dependency of "test" target -->
    <target name="-test-nosecurity" unless="test.class">
      <fileset id="test.nosecurity.classes" dir="${build.test.classes.dir}">
        <include name="**/framework/ScriptTest.class"/>
+       <include name="**/runtime/linker/test/*Test.class"/>
      </fileset>
      <testng outputdir="${build.nosecurity.test.results.dir}/${testResultsSubDir}" classfilesetref="test.nosecurity.classes"
         verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
        <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} -Dbuild.dir=${build.dir}"/>
        <sysproperty key="nashorn.jar" value="${dist.dir}/nashorn.jar"/>