Changeset 6675fcd

Timestamp:

04/04/2015 07:50:45 PM (9 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

2927f48

Parents:

620953d

Message:

Fix tests for OpenJDK, due to the
new version of jtreg

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15783 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/openjdk.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/prog/openjdk.xml

@@ -389 +389 @@
 
     <para>
-      Then, it is necessary to modify some files:
+      Then, it is necessary to modify some files (replace &lt;N&gt; with the
+      number of JAVA VM allowed to run concurrently):
     </para>
 
@@ -404 +405 @@
           sun/pisces          \\
           com/sun/java/swing" >> jdk/test/TEST.groups &amp;&amp;
-sed -e 's/all:.*jck.*/all: jtreg/' \
-    -i langtools/test/Makefile</userinput></screen>
+sed -e 's/all:.*jck.*/all: jtreg/'      \
+    -i langtools/test/Makefile          &amp;&amp;
+sed -i 's@/win32@@' jdk/test/Makefile   &amp;&amp;
+sed -e 's@JTREG_HOME@JT_PLATFORM="" &amp;@' \
+    -e 's@TEST="@CONCURRENCY=&lt;N&gt; &amp;@'    \
+    -i test/Makefile</userinput></screen>
 
     <para>
@@ -424 +429 @@
             JT_JAVA=${JT_JAVA}              \
             PRODUCT_HOME=${PRODUCT_HOME} all
-LANG=C ${JT_HOME}/linux/bin/jtreg -a -v:fail,error \
-                -dir:$(pwd)/hotspot/test    \
-                -k:\!ignore                 \
-                -jdk:${PRODUCT_HOME}        \
+LANG=C ${JT_HOME}/bin/jtreg -a -v:fail,error \
+                -dir:$(pwd)/hotspot/test     \
+                -k:\!ignore                  \
+                -jdk:${PRODUCT_HOME}         \
+                -agentvm -conc:&lt;N&gt;           \
                 :jdk</userinput></screen>
 

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Change the test instructions in OpenJDK
+          to account for the new version of the jtreg test harness.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Update to gnupg2-2.0.27. Fixes
           <ulink url="&blfs-ticket-root;6363">#6363</ulink>.</para>