Attachment #120342 for bug #213502

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 213502
Collapse All | Expand All

Lines 199-204 Link Here

(-)a/nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java (+2 lines)
199	pw.println(name.replaceFirst("^test-(unit\|qa-functional)-sys-prop\\.", "test-sys-prop.") + "=" + outProp);	199	pw.println(name.replaceFirst("^test-(unit\|qa-functional)-sys-prop\\.", "test-sys-prop.") + "=" + outProp);
200	} else if (name.startsWith("test.config")) {	200	} else if (name.startsWith("test.config")) {
201	pw.println(name + "=" + properties.get(name));	201	pw.println(name + "=" + properties.get(name));
		202	} else if ("requires.nb.javac".equals(name)) {
		203	pw.println(name + "=" + properties.get(name));
202	}	204	}
203	}	205	}
204	pw.println("extra.test.libs=" + externalLibBuf.toString());	206	pw.println("extra.test.libs=" + externalLibBuf.toString());




            <available classname="org.testng.annotations.Test" classpath="${extra.test.libs}"/>
        </condition>
        <validatepath pathref="test.cp" failedproperty="wrong.classpath"/>
        <pathconvert property="retouche.javac.api">
            <fileset dir="${netbeans.dest.dir}">
                <include name="java/modules/ext/*javac*api*.jar"/>
            </fileset>
        </pathconvert>
        <pathconvert property="retouche.javac.impl">
            <fileset dir="${netbeans.dest.dir}">
                <include name="java/modules/ext/*javac*impl*.jar"/>
            </fileset>
            <fileset dir="${nbjdk.home}/../Classes" erroronmissingdir="false">
                <include name="*.jar"/>
            </fileset>
        </pathconvert>
        <!-- When requires.nb.javac property is true, prepend javac-api on bootclasspath to allow override the default annotation
             processing API located in rt.jar. On Mac, prepend also javac-impl, so that tests are built against correct version of javac. -->
        <condition property="bootclasspath.prepend" value="${retouche.javac.api}:${retouche.javac.impl}">
            <and>
                <os family="mac"/>
                <istrue value="${requires.nb.javac}"/>
            </and>
        </condition>
        <condition property="bootclasspath.prepend" value="${retouche.javac.api}">
            <istrue value="${requires.nb.javac}"/>
        </condition>
        <condition property="test.bootclasspath.prepend.args" value="-Xbootclasspath/p:${bootclasspath.prepend}">
            <isset property="bootclasspath.prepend"/>
        </condition>
        <property name="test.bootclasspath.prepend.args" value=""/>
    </target>

    <target name="init-data" if="exists.test.data">

                    <syspropertyset refid="test.properties"/>
                    <sysproperty key="nbjunit.workdir" path="${nbjunit.workdir}"/>
                    <sysproperty key="nbjunit.hard.timeout" value="${test.timeout}"/>
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
                    <jvmarg line="${test.run.args}"/>
                    <formatter type="brief" usefile="false"/>
                    <formatter type="xml"/>

                    <classfileset dir="${test.classes.dir}" includes="${test.includes}" excludes="${test.excludes}"/>
                    <propertyset refid="test.properties"/>
                    <classpath refid="test.cp"/>
                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
                    <jvmarg line="${test.run.args}"/>
                    <sysproperty key="nbjunit.workdir" path="${nbjunit.workdir}"/>
                    <sysproperty key="nbjunit.hard.timeout" value="${test.timeout}"/>

Return to bug 213502

Lines 80-85 Link Here

(-)a/nbbuild/testdist/release/one-module.xml (+30 lines)
80	<available classname="org.testng.annotations.Test" classpath="${extra.test.libs}"/>	80	<available classname="org.testng.annotations.Test" classpath="${extra.test.libs}"/>
81	</condition>	81	</condition>
82	<validatepath pathref="test.cp" failedproperty="wrong.classpath"/>	82	<validatepath pathref="test.cp" failedproperty="wrong.classpath"/>
		83	<pathconvert property="retouche.javac.api">
		84	<fileset dir="${netbeans.dest.dir}">
		85	<include name="java/modules/ext/javacapi*.jar"/>
		86	</fileset>
		87	</pathconvert>
		88	<pathconvert property="retouche.javac.impl">
		89	<fileset dir="${netbeans.dest.dir}">
		90	<include name="java/modules/ext/javacimpl*.jar"/>
		91	</fileset>
		92	<fileset dir="${nbjdk.home}/../Classes" erroronmissingdir="false">
		93	<include name="*.jar"/>
		94	</fileset>
		95	</pathconvert>
		96	<!-- When requires.nb.javac property is true, prepend javac-api on bootclasspath to allow override the default annotation
		97	processing API located in rt.jar. On Mac, prepend also javac-impl, so that tests are built against correct version of javac. -->
		98	<condition property="bootclasspath.prepend" value="${retouche.javac.api}:${retouche.javac.impl}">
		99	<and>
		100	<os family="mac"/>
		101	<istrue value="${requires.nb.javac}"/>
		102	</and>
		103	</condition>
		104	<condition property="bootclasspath.prepend" value="${retouche.javac.api}">
		105	<istrue value="${requires.nb.javac}"/>
		106	</condition>
		107	<condition property="test.bootclasspath.prepend.args" value="-Xbootclasspath/p:${bootclasspath.prepend}">
		108	<isset property="bootclasspath.prepend"/>
		109	</condition>
		110	<property name="test.bootclasspath.prepend.args" value=""/>
83	</target>	111	</target>
84		112
85	<target name="init-data" if="exists.test.data">	113	<target name="init-data" if="exists.test.data">
Lines 102-107 Link Here
102	<syspropertyset refid="test.properties"/>	130	<syspropertyset refid="test.properties"/>
103	<sysproperty key="nbjunit.workdir" path="${nbjunit.workdir}"/>	131	<sysproperty key="nbjunit.workdir" path="${nbjunit.workdir}"/>
104	<sysproperty key="nbjunit.hard.timeout" value="${test.timeout}"/>	132	<sysproperty key="nbjunit.hard.timeout" value="${test.timeout}"/>
		133	<jvmarg line="${test.bootclasspath.prepend.args}"/>
105	<jvmarg line="${test.run.args}"/>	134	<jvmarg line="${test.run.args}"/>
106	<formatter type="brief" usefile="false"/>	135	<formatter type="brief" usefile="false"/>
107	<formatter type="xml"/>	136	<formatter type="xml"/>
Lines 123-128 Link Here
123	<classfileset dir="${test.classes.dir}" includes="${test.includes}" excludes="${test.excludes}"/>	152	<classfileset dir="${test.classes.dir}" includes="${test.includes}" excludes="${test.excludes}"/>
124	<propertyset refid="test.properties"/>	153	<propertyset refid="test.properties"/>
125	<classpath refid="test.cp"/>	154	<classpath refid="test.cp"/>
		155	<jvmarg line="${test.bootclasspath.prepend.args}"/>
126	<jvmarg line="${test.run.args}"/>	156	<jvmarg line="${test.run.args}"/>
127	<sysproperty key="nbjunit.workdir" path="${nbjunit.workdir}"/>	157	<sysproperty key="nbjunit.workdir" path="${nbjunit.workdir}"/>
128	<sysproperty key="nbjunit.hard.timeout" value="${test.timeout}"/>	158	<sysproperty key="nbjunit.hard.timeout" value="${test.timeout}"/>