Ubuntu
openjdk-lts package

Merge ~vpa1977/ubuntu/+source/openjdk-lts:merge-openjdk-11 into ubuntu/+source/openjdk-lts:ubuntu/devel

  1. Git
  2. lp:~vpa1977/ubuntu/+source/openjdk-lts
  3. merge-openjdk-11
  4. Merge into ubuntu/devel
Proposed by Vladimir Petko
Status: Needs review
Proposed branch: ~vpa1977/ubuntu/+source/openjdk-lts:merge-openjdk-11
Merge into: ubuntu/+source/openjdk-lts:ubuntu/devel
Prerequisite: ~vpa1977/ubuntu/+source/openjdk-lts:openjdk-11-merge-source
Diff against target: 672 lines (+263/-154)
22 files modified
debian/changelog (+26/-0)
debian/control (+1/-1)
debian/copyright (+0/-2)
debian/patches/nss-limited-ecc-tests.patch (+48/-0)
debian/patches/reproducible-properties-timestamp.diff (+19/-4)
debian/patches/series (+1/-1)
debian/rules (+9/-3)
debian/source/lintian-overrides (+1/-1)
debian/tests/hotspot (+2/-7)
debian/tests/jaxp (+4/-2)
debian/tests/jdk (+3/-7)
debian/tests/jtreg-autopkgtest.in (+4/-1)
debian/tests/jtreg-autopkgtest.sh (+3/-0)
debian/tests/langtools (+5/-3)
debian/tests/problems-armhf.txt (+16/-1)
debian/tests/problems-hotspot.txt (+21/-0)
debian/tests/problems-i386.txt (+3/-0)
debian/tests/problems-jdk.txt (+45/-0)
debian/tests/problems-langtools.txt (+24/-0)
debian/tests/problems-s390x.txt (+3/-0)
debian/tests/write-problems (+25/-0)
dev/null (+0/-121)
Reviewer Review Type Date Requested Status
Matthias Klose (community) Approve
git-ubuntu import Pending
Review via email: mp+453971@code.launchpad.net

Description of the change

Changes:
  * d/source/lintian.overrides: use openjdk-lts package name.
  * Disable jtreg tests on RISC-V due to the infrastructure issue.
  * Merge changes from openjdk-11 11.0.21+9-1 (LP: #2039754).
    - d/test: update problemlist.
    - d/p: drop exclude-broken-tests.patch.
    - d/p/reproducible-properties-timestamp.diff: use the privileged action
      to read the system property (JDK-8272157, 914278).
    - d/copyright: remove liblcms from excluded files.
    - d/t/jtreg-autopkgtest.{sh,in}: JDK-8232153 - set NSS_DEFAULT_DB_TYPE
      to let sun/security/pkcs11/Secmod/AddTrustedCert.java pass.
    - Build using GCC 13 on development versions.
    - Explicitly configure --without-jtreg with the nocheck profile
    - Handle limited ECC capabilities of NSS on older releases.

PPA: ppa:vpa1977/october-21[1]

Note:
 - merging commented out lines from upstream to simplify future merges.

Testing:
 - jtreg tests (see comment).
 - piuparts test[2][3][5][6][7][8][9][10].

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21
[2] https://bugs.launchpad.net/ubuntu/+source/openjdk-lts/+bug/2039754/+attachment/5714192/+files/openjdk-11-source.log.gz
[3] https://bugs.launchpad.net/ubuntu/+source/openjdk-lts/+bug/2039754/+attachment/5714193/+files/openjdk-11-jre-zero.log.gz
[4] https://bugs.launchpad.net/ubuntu/+source/openjdk-lts/+bug/2039754/+attachment/5714194/+files/openjdk-11-jre-headless.log.gz
[5] https://bugs.launchpad.net/ubuntu/+source/openjdk-lts/+bug/2039754/+attachment/5714195/+files/openjdk-11-jre.log.gz
[6] https://bugs.launchpad.net/ubuntu/+source/openjdk-lts/+bug/2039754/+attachment/5714196/+files/openjdk-11-jdk-headless.log.gz
[7] https://bugs.launchpad.net/ubuntu/+source/openjdk-lts/+bug/2039754/+attachment/5714197/+files/openjdk-11-jdk.log.gz
[8] https://bugs.launchpad.net/ubuntu/+source/openjdk-lts/+bug/2039754/+attachment/5714198/+files/openjdk-11-doc.log.gz
[9] https://bugs.launchpad.net/ubuntu/+source/openjdk-lts/+bug/2039754/+attachment/5714199/+files/openjdk-11-demo.log.gz
[10] https://bugs.launchpad.net/ubuntu/+source/openjdk-lts/+bug/2039754/+attachment/5714200/+files/openjdk-11-dbg.log.gz

To post a comment you must log in.
Revision history for this message
Vladimir Petko (vpa1977) wrote :
Download full text (27.6 KiB)

Test results:
----------------cut----------------------------------------------
Platform: amd64
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 1,957
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for langtools ---------------
Test results: passed: 3,926
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jaxp ---------------
Test results: passed: 443
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for jdk ---------------
(xfwm4:455717): dbind-WARNING **: 21:24:00.875: AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
(xfwm4:455717): xfwm4-WARNING **: 21:24:01.544: Another compositing manager is running on screen 0
(xfwm4:455717): xfwm4-WARNING **: 21:24:01.546: Failed to connect to session manager: Failed to connect to the session manager: SESSION_MANAGER environment variable not defined
Test results: passed: 5,347
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
Killed
make[2]: Leaving directory '/<<PKGBUILDDIR>>'
 Command being timed: "/usr/bin/make -f debian/rules -k jtregcheck TEST_SUITES=hotspot langtools jaxp jdk JTREG_OPTIONS="
 User time (seconds): 24601.38
 System time (seconds): 1531.71
 Percent of CPU this job got: 333%
 Elapsed (wall clock) time (h:mm:ss or m:ss): 2:10:45
 Average shared text size (kbytes): 0
 Average unshared data size (kbytes): 0
 Average stack size (kbytes): 0
 Average total size (kbytes): 0
 Maximum resident set size (kbytes): 6547400
 Average resident set size (kbytes): 0
 Major (requiring I/O) page faults: 1288
 Minor (reclaiming a frame) page faults: 343961120
 Voluntary context switches: 47004675
 Involuntary context switches: 29439813
 Swaps: 0
 File system inputs: 2310520
 File system outputs: 68760264
 Socket messages sent: 0
 Socket messages received: 0
 Signals delivered: 0
 Page size (bytes): 4096
 Exit status: 0
--------------- jtreg console summary for hotspot ---------------
Test results: passed: 1,957
[debian/tests/jtreg-autopkgtest.sh] nothing to cleanup
Unable to compare jtreg results: no build jtreport found for hotspot/amd64.
Reason: '/usr/share/doc/openjdk-11-jre-headless//test-amd64/jtreport-hotspot.tar.gz' does not exist.
--------------- jtreg console summary for langtools ---------------
Test results: passed: 3...

Reply
Revision history for this message
Matthias Klose (doko) wrote :

that looks ok

review: Approve
Reply
Revision history for this message
Vladimir Petko (vpa1977) wrote :

Upload with the original tarball from Security Proposed: https://launchpad.net/~vpa1977/+archive/ubuntu/october-21-2/+packages

Reply

Unmerged commits

4b96b9c... by Vladimir Petko

changelog

c859439... by Vladimir Petko

  * d/source/lintian-overrides: use openjdk-lts package name.

e8f137c... by Vladimir Petko

  * Merge from Debian openjdk-11 11.0.21+9.

b1adfdb... by Vladimir Petko

  New upstream version 11.0.21+9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index ff6645d..8cbb4f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
1openjdk-lts (11.0.21+9-0ubuntu1) noble; urgency=medium
2
3 * OpenJDK 11.0.21 release, build 9.
4 - CVE-2023-22081.
5 - Release notes:
6 https://mail.openjdk.org/pipermail/jdk-updates-dev/2023-October/026351.html
7 * d/source/lintian.overrides: use openjdk-lts package name.
8 * Disable jtreg tests on RISC-V due to the infrastructure issue.
9 * Merge changes from openjdk-11 11.0.21+9-1 (LP: #2039754).
10 - d/test: update problemlist.
11 - d/p: drop exclude-broken-tests.patch.
12 - d/p/reproducible-properties-timestamp.diff: use the privileged action
13 to read the system property (JDK-8272157, 914278).
14 - d/copyright: remove liblcms from excluded files.
15 - d/t/jtreg-autopkgtest.{sh,in}: JDK-8232153 - set NSS_DEFAULT_DB_TYPE
16 to let sun/security/pkcs11/Secmod/AddTrustedCert.java pass.
17
18 [ Matthias Klose ]
19 - Build using GCC 13 on development versions.
20 - Explicitly configure --without-jtreg with the nocheck profile
21
22 [ Pushkar Kulkarni ]
23 - Handle limited ECC capabilities of NSS on older releases.
24
25 -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 26 Oct 2023 16:16:27 +1300
26
1openjdk-lts (11.0.20+8-1ubuntu1) mantic; urgency=high27openjdk-lts (11.0.20+8-1ubuntu1) mantic; urgency=high
228
3 * OpenJDK 11.0.20 release, build 8.29 * OpenJDK 11.0.20 release, build 8.
diff --git a/debian/control b/debian/control
index a596563..d3e52fa 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 11),
10 time, strip-nondeterminism, debugedit (>= 4.16),10 time, strip-nondeterminism, debugedit (>= 4.16),
11 jtreg6 (>= 6+1-0~) <!nocheck>, libtestng7-java <!nocheck>, xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, libasmtools-java <!nocheck>, googletest <!nocheck>, google-mock <!nocheck>, xvfb <!nocheck>,11 jtreg6 (>= 6+1-0~) <!nocheck>, libtestng7-java <!nocheck>, xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, libasmtools-java <!nocheck>, googletest <!nocheck>, google-mock <!nocheck>, xvfb <!nocheck>,
12 autoconf, automake, autotools-dev, ant, ant-optional,12 autoconf, automake, autotools-dev, ant, ant-optional,
13 g++-12 <!cross>,13 g++-13 <!cross>,
14 openjdk-11-jdk-headless:native | openjdk-10-jdk-headless:native,14 openjdk-11-jdk-headless:native | openjdk-10-jdk-headless:native,
15 libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, libelf-dev, libfontconfig1-dev, libgtk2.0-0 | libgtk-3-0, libharfbuzz-dev,15 libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, libelf-dev, libfontconfig1-dev, libgtk2.0-0 | libgtk-3-0, libharfbuzz-dev,
16 libffi-dev,16 libffi-dev,
diff --git a/debian/copyright b/debian/copyright
index 4598ff2..fb2db69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Files-Excluded:2Files-Excluded:
3 .github/*3 .github/*
4 .gitattributes4 .gitattributes
5 src/java.desktop/share/native/liblcms/cms*.c
6 src/java.desktop/share/native/liblcms/lcms2*.h
7 src/java.base/share/native/libzip/zlib/*5 src/java.base/share/native/libzip/zlib/*
8 src/java.desktop/share/native/libsplashscreen/giflib/*6 src/java.desktop/share/native/libsplashscreen/giflib/*
9 src/java.desktop/share/native/libsplashscreen/libpng/*7 src/java.desktop/share/native/libsplashscreen/libpng/*
diff --git a/debian/patches/exclude-broken-tests.patch b/debian/patches/exclude-broken-tests.patch
10deleted file mode 1006448deleted file mode 100644
index 2a9983b..0000000
--- a/debian/patches/exclude-broken-tests.patch
+++ /dev/null
@@ -1,121 +0,0 @@
1 Description: Disable failing tests
2 Disable tests that fail on Ubuntu pending investigation
3Author: Vladimir Petko <vladimir.petko@canonical.com>
4Forwarded: not-needed
5Last-Update: 2023-03-24
6--- a/test/hotspot/jtreg/ProblemList.txt
7+++ b/test/hotspot/jtreg/ProblemList.txt
8@@ -38,6 +38,26 @@
9 #
10 #############################################################################
11
12+# tests that need to be investigated
13+
14+gc/shenandoah/mxbeans/TestChurnNotifications.java#aggressive 0000000 generic-all
15+gc/shenandoah/mxbeans/TestChurnNotifications.java#iu 0000000 generic-all
16+
17+#result: Failed. Execution failed: `main' threw exception: java.io.IOException: Mount point not found
18+# https://bugs.openjdk.org/browse/JDK-8166162
19+
20+runtime/LoadClass/LongBCP.java 8166162 generic-all
21+
22+# Intermittent failures because LingeredApp.class is not found
23+
24+runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java 000000 generic-all
25+runtime/cds/appcds/jcmd/JCmdTestFileSafety.java 000000 generic-all
26+runtime/cds/appcds/jcmd/JCmdTestStaticDump.java 000000 generic-all
27+
28+# Unexpected exit from the test
29+
30+runtime/NMT/SafepointPollingPages.java 000000 generic-all
31+
32 # :hotspot_compiler
33
34 compiler/aot/verification/vmflags/TrackedFlagTest.java 8215224 generic-all
35--- a/test/langtools/ProblemList.txt
36+++ b/test/langtools/ProblemList.txt
37@@ -23,6 +23,32 @@
38 #
39 ###########################################################################
40
41+# Wrong test environment in autopkgtest
42+# java.lang.IllegalStateException: Launching JShell execution engine threw: ERROR: transport error 202: getaddrinfo: failed to parse address
43+
44+jdk/jshell/JdiListeningLocalhostExecutionControlTest.java 0000000 generic-all
45+
46+# tests failing due to disable-doclint-by-default.diff
47+
48+jdk/javadoc/doclet/testSupplementary/TestSupplementary.java 0000000 generic-all
49+jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java 0000000 generic-all
50+jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java 0000000 generic-all
51+jdk/javadoc/doclet/testStylesheet/TestStylesheet.java 0000000 generic-all
52+jdk/javadoc/doclet/testSeeTag/TestSeeTag.java 0000000 generic-all
53+jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java 0000000 generic-all
54+jdk/javadoc/doclet/testBadHtml/TestBadHtml.java 0000000 generic-all
55+jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java 0000000 generic-all
56+jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java 0000000 generic-all
57+jdk/javadoc/doclet/dupThrowsTags/TestDupThrowsTags.java 0000000 generic-all
58+jdk/javadoc/doclet/testLinkOption/TestLinkOption.java 0000000 generic-all
59+jdk/javadoc/doclet/T6735320/T6735320.java 0000000 generic-all
60+jdk/javadoc/doclet/testValueTag/TestValueTag.java 0000000 generic-all
61+jdk/javadoc/tool/modules/Modules.java 0000000 generic-all
62+jdk/javadoc/doclet/testWarnings/TestWarnings.java 0000000 generic-all
63+jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java 0000000 generic-all
64+jdk/javadoc/tool/doclint/DocLintTest.java 0000000 generic-all
65+jdk/javadoc/doclet/testBadPackageFileInJar/TestBadPackageFileInJar.java 0000000 generic-all
66+
67 ###########################################################################
68 #
69 # javadoc
70--- a/test/jdk/ProblemList.txt
71+++ b/test/jdk/ProblemList.txt
72@@ -110,6 +110,49 @@
73 #
74 #############################################################################
75
76+
77+
78+# to investigate
79+# unable to read LD_LIBRARY_PATH env variable
80+
81+tools/jpackage/share/AppLauncherEnvTest.java 0000000 generic-all
82+
83+# java.lang.Exception: Proc abnormal end
84+
85+sun/security/krb5/auto/Cleaners.java 0000000 generic-all
86+
87+# result: Failed. Execution failed: `main' threw exception: java.io.IOException: Mount point not found
88+# https://bugs.openjdk.org/browse/JDK-8166162
89+
90+java/io/File/createTempFile/TargetDirectory.java 8166162 generic-all
91+java/nio/file/Files/CheckPermissions.java 8166162 generic-all
92+java/nio/file/Files/TemporaryFiles.java 8166162 generic-all
93+java/nio/file/Files/Misc.java 8166162 generic-all
94+java/nio/file/Files/CopyAndMove.java 8166162 generic-all
95+java/nio/file/Files/InterruptCopy.java 8166162 generic-all
96+java/nio/file/Files/FileAttributes.java 8166162 generic-all
97+java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java 8166162 generic-all
98+java/nio/file/attribute/AclFileAttributeView/Basic.java 8166162 generic-all
99+java/nio/file/attribute/DosFileAttributeView/Basic.java 8166162 generic-all
100+java/nio/file/attribute/PosixFileAttributeView/Basic.java 8166162 generic-all
101+java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java 8166162 generic-all
102+java/nio/file/FileStore/Basic.java 8166162 generic-all
103+java/nio/channels/FileChannel/directio/DirectIOTest.java 8166162 generic-all
104+java/nio/channels/FileChannel/directio/ReadDirect.java 8166162 generic-all
105+java/nio/channels/FileChannel/directio/PreadDirect.java 8166162 generic-all
106+java/nio/channels/FileChannel/directio/PwriteDirect.java 8166162 generic-all
107+java/nio/channels/FileChannel/directio/WriteDirect.java 8166162 generic-all
108+
109+# utf-8 locale is missing on build machine
110+# https://bugs.openjdk.org/browse/JDK-8249079
111+
112+java/lang/invoke/lambda/LambdaFileEncodingSerialization.java 8249079 generic-all
113+
114+# reproducible-properties-timestamp.diff introduce a bug that breaks this test
115+# remove after the patch is dropped
116+
117+java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigWithInputStreamTest.java 000000 generic-all
118+
119 ############################################################################
120
121 # jdk_awt
diff --git a/debian/patches/nss-limited-ecc-tests.patch b/debian/patches/nss-limited-ecc-tests.patch
122new file mode 1006440new file mode 100644
index 0000000..7a75015
--- /dev/null
+++ b/debian/patches/nss-limited-ecc-tests.patch
@@ -0,0 +1,48 @@
1--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
2+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
3@@ -99,7 +99,7 @@
4 // NSS version info
5 public static enum ECCState { None, Basic, Extended };
6 static double nss_version = -1;
7- static ECCState nss_ecc_status = ECCState.Extended;
8+ static ECCState nss_ecc_status = ECCState.Basic;
9
10 // The NSS library we need to search for in getNSSLibDir()
11 // Default is "libsoftokn3.so", listed as "softokn3"
12--- a/test/jdk/sun/security/pkcs11/ec/TestECDH.java
13+++ b/test/jdk/sun/security/pkcs11/ec/TestECDH.java
14@@ -124,8 +124,12 @@
15 return;
16 }
17
18- test(p, pub192a, priv192a, pub192b, priv192b, secret192);
19- test(p, pub163a, priv163a, pub163b, priv163b, secret163);
20+ if (getSupportedECParameterSpec("secp192r1", p).isPresent()) {
21+ test(p, pub192a, priv192a, pub192b, priv192b, secret192);
22+ }
23+ if (getSupportedECParameterSpec("sect163r1", p).isPresent()) {
24+ test(p, pub163a, priv163a, pub163b, priv163b, secret163);
25+ }
26
27 if (getSupportedECParameterSpec("brainpoolP256r1", p).isPresent()) {
28 test(p, pubBrainpoolP256r1a, privBrainpoolP256r1a, pubBrainpoolP256r1b, privBrainpoolP256r1b, secretBrainpoolP256r1);
29--- a/test/jdk/sun/security/pkcs11/ec/TestECDSA.java
30+++ b/test/jdk/sun/security/pkcs11/ec/TestECDSA.java
31@@ -156,12 +156,14 @@
32 return;
33 }
34
35- if (getNSSECC() != ECCState.Basic) {
36+ if (getSupportedECParameterSpec("secp192r1", provider).isPresent()) {
37 test(provider, pub192, priv192, sig192);
38+ }
39+ if (getSupportedECParameterSpec("sect163r1", provider).isPresent()) {
40 test(provider, pub163, priv163, sig163);
41+ }
42+ if (getSupportedECParameterSpec("sect571r1", provider).isPresent()) {
43 test(provider, pub571, priv571, sig571);
44- } else {
45- System.out.println("ECC Basic only, skipping 192, 163 and 571.");
46 }
47 test(provider, pub521, priv521, sig521);
48
diff --git a/debian/patches/reproducible-properties-timestamp.diff b/debian/patches/reproducible-properties-timestamp.diff
index 596c01c..0f2bd72 100644
--- a/debian/patches/reproducible-properties-timestamp.diff
+++ b/debian/patches/reproducible-properties-timestamp.diff
@@ -3,7 +3,17 @@ Author: Emmanuel Bourg <ebourg@apache.org>
3Forwarded: no3Forwarded: no
4--- a/src/java.base/share/classes/java/util/Properties.java4--- a/src/java.base/share/classes/java/util/Properties.java
5+++ b/src/java.base/share/classes/java/util/Properties.java5+++ b/src/java.base/share/classes/java/util/Properties.java
6@@ -929,7 +929,7 @@6@@ -53,6 +53,9 @@
7 import sun.nio.cs.UTF_8;
8 import sun.nio.cs.ISO_8859_1;
9
10+import java.security.AccessController;
11+import java.security.PrivilegedAction;
12+
13 /**
14 * The {@code Properties} class represents a persistent set of
15 * properties. The {@code Properties} can be saved to a stream
16@@ -929,7 +932,7 @@
7 if (comments != null) {17 if (comments != null) {
8 writeComments(bw, comments);18 writeComments(bw, comments);
9 }19 }
@@ -12,7 +22,7 @@ Forwarded: no
12 bw.newLine();22 bw.newLine();
13 synchronized (this) {23 synchronized (this) {
14 for (Map.Entry<Object, Object> e : entrySet()) {24 for (Map.Entry<Object, Object> e : entrySet()) {
15@@ -1579,4 +1579,22 @@25@@ -1579,4 +1582,27 @@
16 }26 }
17 this.map = map;27 this.map = map;
18 }28 }
@@ -23,14 +33,19 @@ Forwarded: no
23+ * environment variable is specified. In this case the format used is33+ * environment variable is specified. In this case the format used is
24+ * locale and timezone insensitive to ensure the output is reproducible.34+ * locale and timezone insensitive to ensure the output is reproducible.
25+ */35+ */
36+ @SuppressWarnings("removal")
26+ private String getFormattedTimestamp() {37+ private String getFormattedTimestamp() {
27+ if (System.getenv("SOURCE_DATE_EPOCH") == null) {38+ String epoch = AccessController.doPrivileged(new PrivilegedAction<String>(){
39+ public String run() { return System.getenv("SOURCE_DATE_EPOCH"); }
40+ });
41+
42+ if (epoch == null) {
28+ return new Date().toString();43+ return new Date().toString();
29+ } else {44+ } else {
30+ // Use the SOURCE_DATE_EPOCH timestamp and make the format locale/timezone insensitive45+ // Use the SOURCE_DATE_EPOCH timestamp and make the format locale/timezone insensitive
31+ java.text.SimpleDateFormat fmt = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss z", java.util.Locale.ENGLISH);46+ java.text.SimpleDateFormat fmt = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss z", java.util.Locale.ENGLISH);
32+ fmt.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));47+ fmt.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));
33+ Date date = new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));48+ Date date = new Date(1000 * Long.parseLong(epoch));
34+ return fmt.format(date);49+ return fmt.format(date);
35+ }50+ }
36+ }51+ }
diff --git a/debian/patches/series b/debian/patches/series
index 595607b..d03514a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,4 +38,4 @@ log-generated-classes-test.patch
38update-permission-test.patch38update-permission-test.patch
39ldap-timeout-test-use-ip.patch39ldap-timeout-test-use-ip.patch
40test-use-ip-address.patch40test-use-ip-address.patch
41exclude-broken-tests.patch41nss-limited-ecc-tests.patch
diff --git a/debian/rules b/debian/rules
index 6d80f7b..749a613 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,6 +78,7 @@ else
78endif78endif
7979
80is_upstream_release = yes80is_upstream_release = yes
81#is_upstream_release =
8182
82srcdir = .83srcdir = .
83builddir = build84builddir = build
@@ -157,7 +158,7 @@ testng_pkg= libtestng7-java
157158
158with_check = $(if $(findstring nocheck, $(DEB_BUILD_OPTIONS)),,yes)159with_check = $(if $(findstring nocheck, $(DEB_BUILD_OPTIONS)),,yes)
159# see Debian #920161160# see Debian #920161
160ifneq (,$(filter $(DEB_HOST_ARCH), alpha))161ifneq (,$(filter $(DEB_HOST_ARCH), alpha riscv64))
161 with_check = disabled running check on $(DEB_HOST_ARCH)162 with_check = disabled running check on $(DEB_HOST_ARCH)
162endif163endif
163# no jtreg backport yet164# no jtreg backport yet
@@ -335,10 +336,14 @@ else ifneq (,$(filter $(distrel),jammy))
335 export CC = $(DEB_HOST_GNU_TYPE)-gcc-11336 export CC = $(DEB_HOST_GNU_TYPE)-gcc-11
336 export CXX = $(DEB_HOST_GNU_TYPE)-g++-11337 export CXX = $(DEB_HOST_GNU_TYPE)-g++-11
337 bd_gcc = g++-11 <!cross>,338 bd_gcc = g++-11 <!cross>,
338else339else ifneq (,$(filter $(distrel),bookworm lunar))
339 export CC = $(DEB_HOST_GNU_TYPE)-gcc-12340 export CC = $(DEB_HOST_GNU_TYPE)-gcc-12
340 export CXX = $(DEB_HOST_GNU_TYPE)-g++-12341 export CXX = $(DEB_HOST_GNU_TYPE)-g++-12
341 bd_gcc = g++-12 <!cross>,342 bd_gcc = g++-12 <!cross>,
343else
344 export CC = $(DEB_HOST_GNU_TYPE)-gcc-13
345 export CXX = $(DEB_HOST_GNU_TYPE)-g++-13
346 bd_gcc = g++-13 <!cross>,
342endif347endif
343348
344# until we are able to b-d on gcc-for-host ...349# until we are able to b-d on gcc-for-host ...
@@ -1878,8 +1883,9 @@ endif
1878 dh_builddeb -a $(nodemo) $(nojrez) #$(bd_options)1883 dh_builddeb -a $(nodemo) $(nojrez) #$(bd_options)
18791884
1880is_release = yes1885is_release = yes
1886#is_release =
1881git_project = jdk11u1887git_project = jdk11u
1882git_tag = jdk-11.0.20+81888git_tag = jdk-11.0.21+9
1883package_version = $(subst jdk-,,$(git_tag))1889package_version = $(subst jdk-,,$(git_tag))
1884package_version = $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//')1890package_version = $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//')
1885ifneq ($(is_release),yes)1891ifneq ($(is_release),yes)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 9cbed57..04c5846 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,2 @@
1# parts of the test suite, not installed1# parts of the test suite, not installed
2openjdk-11 source: source-is-missing2openjdk-lts source: source-is-missing
diff --git a/debian/tests/hotspot b/debian/tests/hotspot
index b5a1f87..e937056 100755
--- a/debian/tests/hotspot
+++ b/debian/tests/hotspot
@@ -4,13 +4,8 @@ set -o errtrace
4set -o pipefail4set -o pipefail
5set -o nounset5set -o nounset
66
7problem_list=${AUTOPKGTEST_TMP}/hotspot-problems.txt7problem_list=${AUTOPKGTEST_TMP}/problems.txt
8cat test/hotspot/jtreg/ProblemList.txt > ${problem_list}8debian/tests/write-problems ${problem_list} test/hotspot/jtreg/ProblemList.txt hotspot
9
10host_arch="${DEB_HOST_ARCH:-$(dpkg --print-architecture)}"
11if [[ -f debian/tests/problems-${host_arch}.txt ]]; then
12 cat debian/tests/problems-${host_arch}.txt >> ${problem_list}
13fi
149
15native_path=$(pwd)/build/images/test/hotspot/jtreg/native10native_path=$(pwd)/build/images/test/hotspot/jtreg/native
16debian/tests/jtreg-autopkgtest.sh hotspot \11debian/tests/jtreg-autopkgtest.sh hotspot \
diff --git a/debian/tests/jaxp b/debian/tests/jaxp
index acdd84f..cad3802 100755
--- a/debian/tests/jaxp
+++ b/debian/tests/jaxp
@@ -4,10 +4,12 @@ set -o errtrace
4set -o pipefail4set -o pipefail
5set -o nounset5set -o nounset
66
7problem_list=${AUTOPKGTEST_TMP}/problems.txt
8debian/tests/write-problems ${problem_list} test/jaxp/ProblemList.txt jaxp
9
7debian/tests/jtreg-autopkgtest.sh jaxp \10debian/tests/jtreg-autopkgtest.sh jaxp \
8 -exclude:test/jaxp/ProblemList.txt \11 -exclude:${problem_list} \
9 -dir:test/jaxp \12 -dir:test/jaxp \
10 -k:!stress \13 -k:!stress \
11 :tier1 :tier214 :tier1 :tier2
12
13debian/tests/jtdiff-autopkgtest.sh jaxp15debian/tests/jtdiff-autopkgtest.sh jaxp
diff --git a/debian/tests/jdk b/debian/tests/jdk
index 9b0553d..79e1ec0 100755
--- a/debian/tests/jdk
+++ b/debian/tests/jdk
@@ -4,6 +4,7 @@ set -o errtrace
4set -o pipefail4set -o pipefail
5set -o nounset5set -o nounset
66
7
7cleanup() {8cleanup() {
8 # kill window manager to clean up (rest will exit automatically)9 # kill window manager to clean up (rest will exit automatically)
9 pid="$(jobs -p)"10 pid="$(jobs -p)"
@@ -25,13 +26,8 @@ export DISPLAY=:10
25debian/tests/start-xvfb.sh 10 &26debian/tests/start-xvfb.sh 10 &
26sleep 327sleep 3
2728
28problem_list=${AUTOPKGTEST_TMP}/jdk-problems.txt29problem_list=${AUTOPKGTEST_TMP}/problems.txt
29cat test/jdk/ProblemList.txt > ${problem_list}30debian/tests/write-problems ${problem_list} test/jdk/ProblemList.txt jdk
30
31host_arch="${DEB_HOST_ARCH:-$(dpkg --print-architecture)}"
32if [[ -f debian/tests/problems-${host_arch}.txt ]]; then
33 cat debian/tests/problems-${host_arch}.txt >> ${problem_list}
34fi
3531
36native_path=$(pwd)/build/images/test/jdk/jtreg/native32native_path=$(pwd)/build/images/test/jdk/jtreg/native
37debian/tests/jtreg-autopkgtest.sh jdk \33debian/tests/jtreg-autopkgtest.sh jdk \
diff --git a/debian/tests/jtreg-autopkgtest.in b/debian/tests/jtreg-autopkgtest.in
index 1e3e806..747d296 100755
--- a/debian/tests/jtreg-autopkgtest.in
+++ b/debian/tests/jtreg-autopkgtest.in
@@ -32,7 +32,7 @@ fi
32if dpkg --compare-versions ${jtreg_version} ge 4.2; then32if dpkg --compare-versions ${jtreg_version} ge 4.2; then
33 jt_options+=" -conc:auto"33 jt_options+=" -conc:auto"
34fi34fi
35 35
36# check java binary36# check java binary
37if [ ! -x "${JDK_TO_TEST}/bin/java" ]; then37if [ ! -x "${JDK_TO_TEST}/bin/java" ]; then
38 echo "Error: '${JDK_TO_TEST}/bin/java' is not an executable." >&238 echo "Error: '${JDK_TO_TEST}/bin/java' is not an executable." >&2
@@ -104,6 +104,9 @@ for i in 0 1 2; do
104 -jdk:${JDK_TO_TEST} \104 -jdk:${JDK_TO_TEST} \
105 -vmoption:-Dtest.boot.jdk=${BOOTJDK_HOME} \105 -vmoption:-Dtest.boot.jdk=${BOOTJDK_HOME} \
106 -vmoption:-XX:MaxRAMPercentage=25 \106 -vmoption:-XX:MaxRAMPercentage=25 \
107 -vmoption:-Duser.home=${AUTOPKGTEST_TMP} \
108 -vmoption:-Djava.io.tmpdir=${AUTOPKGTEST_TMP} \
109 -e:NSS_DEFAULT_DB_TYPE=sql \
107 ${on_retry:-} $@ \110 ${on_retry:-} $@ \
108 && exit_code=0 || exit_code=$?111 && exit_code=0 || exit_code=$?
109112
diff --git a/debian/tests/jtreg-autopkgtest.sh b/debian/tests/jtreg-autopkgtest.sh
index 7e3bfc3..ad0763a 100755
--- a/debian/tests/jtreg-autopkgtest.sh
+++ b/debian/tests/jtreg-autopkgtest.sh
@@ -109,7 +109,10 @@ for i in 0 1 2; do
109 -reportDir:"${report_dir}" \109 -reportDir:"${report_dir}" \
110 -jdk:${JDK_TO_TEST} \110 -jdk:${JDK_TO_TEST} \
111 -vmoption:-Dtest.boot.jdk=${BOOTJDK_HOME} \111 -vmoption:-Dtest.boot.jdk=${BOOTJDK_HOME} \
112 -vmoption:-Duser.home=${AUTOPKGTEST_TMP} \
113 -vmoption:-Djava.io.tmpdir=${AUTOPKGTEST_TMP} \
112 -vmoption:-XX:MaxRAMPercentage=25 \114 -vmoption:-XX:MaxRAMPercentage=25 \
115 -e:NSS_DEFAULT_DB_TYPE=sql \
113 ${on_retry:-} $@ \116 ${on_retry:-} $@ \
114 && exit_code=0 || exit_code=$?117 && exit_code=0 || exit_code=$?
115118
diff --git a/debian/tests/langtools b/debian/tests/langtools
index 9a24522..4db8e24 100755
--- a/debian/tests/langtools
+++ b/debian/tests/langtools
@@ -4,10 +4,12 @@ set -o errtrace
4set -o pipefail4set -o pipefail
5set -o nounset5set -o nounset
66
7problem_list=${AUTOPKGTEST_TMP}/problems.txt
8debian/tests/write-problems ${problem_list} test/langtools/ProblemList.txt langtools
9
7debian/tests/jtreg-autopkgtest.sh langtools \10debian/tests/jtreg-autopkgtest.sh langtools \
8 -exclude:test/langtools/ProblemList.txt \11 -exclude:${problem_list} \
9 -dir:test/langtools \12 -dir:test/langtools \
10 -k:!stress \13 -k:!stress \
11 :tier1 :tier214 :tier1 :tier2
12
13debian/tests/jtdiff-autopkgtest.sh langtools15debian/tests/jtdiff-autopkgtest.sh langtools
diff --git a/debian/tests/problems-armhf.txt b/debian/tests/problems-armhf.txt
index 0df5a72..5557a31 100644
--- a/debian/tests/problems-armhf.txt
+++ b/debian/tests/problems-armhf.txt
@@ -18,5 +18,20 @@ compiler/codecache/MHIntrinsicAllocFailureTest.java
18# this test passes but is very slow in CI, causing timeout18# this test passes but is very slow in CI, causing timeout
1919
20jdk/sun/security/rsa/SignedObjectChain.java 000000 generic-all20jdk/sun/security/rsa/SignedObjectChain.java 000000 generic-all
21sun/security/rsa/SignedObjectChain.java 000000 generic-all
21sun/security/ec/ed/EdDSATest.java 000000 generic-all22sun/security/ec/ed/EdDSATest.java 000000 generic-all
22java/security/SignedObject/Chain.java 000000 generic-all
23\ No newline at end of file23\ No newline at end of file
24java/security/SignedObject/Chain.java 000000 generic-all
25
26# timeout in SSL connection
27java/net/httpclient/ManyRequestsLegacy.java 000000 generic-all
28# deadlock
29java/util/Random/RandomTestBsi1999.java 000000 generic-all
30
31# runner issue, disk space size exceeds 32 bit integer
32java/io/File/GetXSpace.java 000000 generic-all
33
34# https://bugs.openjdk.org/browse/JDK-8303168
35serviceability/AsyncGetCallTrace/MyPackage/ASGCTBaseTest.java 000000 generic-all
36
37# native stack not implemented
38runtime/jni/nativeStack/TestNativeStack.java 000000 generic-all
diff --git a/debian/tests/problems-hotspot.txt b/debian/tests/problems-hotspot.txt
24new file mode 10064439new file mode 100644
index 0000000..1420b16
--- /dev/null
+++ b/debian/tests/problems-hotspot.txt
@@ -0,0 +1,21 @@
1# tests that need to be investigated
2
3gc/shenandoah/mxbeans/TestChurnNotifications.java#aggressive 0000000 generic-all
4gc/shenandoah/mxbeans/TestChurnNotifications.java#iu 0000000 generic-all
5
6#result: Failed. Execution failed: `main' threw exception: java.io.IOException: Mount point not found
7# https://bugs.openjdk.org/browse/JDK-8166162
8
9runtime/LoadClass/LongBCP.java 8166162 generic-all
10
11# flaky test
12compiler/vectorization/runner/MultipleLoopsTest.java 000000 generic-all
13
14# Intermittent failures because LingeredApp.class is not found
15runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java 000000 generic-all
16runtime/cds/appcds/jcmd/JCmdTestFileSafety.java 000000 generic-all
17runtime/cds/appcds/jcmd/JCmdTestStaticDump.java 000000 generic-all
18
19# Unexpected exit from the test
20runtime/NMT/SafepointPollingPages.java 000000 generic-all
21
diff --git a/debian/tests/problems-i386.txt b/debian/tests/problems-i386.txt
index 10cc71e..e28559c 100644
--- a/debian/tests/problems-i386.txt
+++ b/debian/tests/problems-i386.txt
@@ -13,3 +13,6 @@ gtest/GTestWrapper.java 000000 generic-all
13tools/jlink/JLinkTest.java 000000 generic-all13tools/jlink/JLinkTest.java 000000 generic-all
1414
15java/net/httpclient/http2/HpackBinaryTestDriver.java 000000 generic-all15java/net/httpclient/http2/HpackBinaryTestDriver.java 000000 generic-all
16
17# runner issue, disk space size exceeds 32 bit integer
18java/io/File/GetXSpace.java 000000 generic-all
diff --git a/debian/tests/problems-jdk.txt b/debian/tests/problems-jdk.txt
16new file mode 10064419new file mode 100644
index 0000000..fd5b0ca
--- /dev/null
+++ b/debian/tests/problems-jdk.txt
@@ -0,0 +1,45 @@
1# NSS3 failure when processing SHA3 hashes (needs investigation)
2sun/security/pkcs11/Signature/KeyAndParamCheckForPSS.java 0000000 generic-all
3sun/security/pkcs11/MessageDigest/TestCloning.java 0000000 generic-all
4sun/security/pkcs11/Signature/SignatureTestPSS.java 0000000 generic-all
5
6# https://bugs.openjdk.org/browse/JDK-8312488
7tools/jpackage/share/AppLauncherEnvTest.java 0000000 generic-all
8
9# java.lang.Exception: Proc abnormal end
10sun/security/krb5/auto/Cleaners.java 0000000 generic-all
11
12# result: Failed. Execution failed: `main' threw exception: java.io.IOException: Mount point not found
13# https://bugs.openjdk.org/browse/JDK-8166162
14
15java/io/File/createTempFile/TargetDirectory.java 8166162 generic-all
16java/nio/file/Files/CheckPermissions.java 8166162 generic-all
17java/nio/file/Files/TemporaryFiles.java 8166162 generic-all
18java/nio/file/Files/Misc.java 8166162 generic-all
19java/nio/file/Files/CopyAndMove.java 8166162 generic-all
20java/nio/file/Files/InterruptCopy.java 8166162 generic-all
21java/nio/file/Files/FileAttributes.java 8166162 generic-all
22java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java 8166162 generic-all
23java/nio/file/attribute/AclFileAttributeView/Basic.java 8166162 generic-all
24java/nio/file/attribute/DosFileAttributeView/Basic.java 8166162 generic-all
25java/nio/file/attribute/PosixFileAttributeView/Basic.java 8166162 generic-all
26java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java 8166162 generic-all
27java/nio/file/FileStore/Basic.java 8166162 generic-all
28java/nio/channels/FileChannel/directio/DirectIOTest.java 8166162 generic-all
29java/nio/channels/FileChannel/directio/ReadDirect.java 8166162 generic-all
30java/nio/channels/FileChannel/directio/PreadDirect.java 8166162 generic-all
31java/nio/channels/FileChannel/directio/PwriteDirect.java 8166162 generic-all
32java/nio/channels/FileChannel/directio/WriteDirect.java 8166162 generic-all
33
34# utf-8 locale is missing on build machine
35# https://bugs.openjdk.org/browse/JDK-8249079
36
37java/lang/invoke/lambda/LambdaFileEncodingSerialization.java 8249079 generic-all
38
39# disable scoped value (incubating feature) test pending investigation
40
41jdk/incubator/concurrent/ScopedValue/StressStackOverflow.java 000000 generic-all
42java/lang/ScopedValue/StressStackOverflow.java 000000 generic-all
43
44# https://bugs.openjdk.org/browse/JDK-8309214
45sun/security/pkcs11/KeyStore/CertChainRemoval.java 000000 generic-all
diff --git a/debian/tests/problems-langtools.txt b/debian/tests/problems-langtools.txt
0new file mode 10064446new file mode 100644
index 0000000..ea2e999
--- /dev/null
+++ b/debian/tests/problems-langtools.txt
@@ -0,0 +1,24 @@
1# Wrong test environment in autopkgtest
2# java.lang.IllegalStateException: Launching JShell execution engine threw: ERROR: transport error 202: getaddrinfo: failed to parse address
3jdk/jshell/JdiListeningLocalhostExecutionControlTest.java 0000000 generic-all
4
5# tests failing due to disable-doclint-by-default.diff
6
7jdk/javadoc/doclet/testSupplementary/TestSupplementary.java 0000000 generic-all
8jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java 0000000 generic-all
9jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java 0000000 generic-all
10jdk/javadoc/doclet/testStylesheet/TestStylesheet.java 0000000 generic-all
11jdk/javadoc/doclet/testSeeTag/TestSeeTag.java 0000000 generic-all
12jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java 0000000 generic-all
13jdk/javadoc/doclet/testBadHtml/TestBadHtml.java 0000000 generic-all
14jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java 0000000 generic-all
15jdk/javadoc/doclet/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java 0000000 generic-all
16jdk/javadoc/doclet/dupThrowsTags/TestDupThrowsTags.java 0000000 generic-all
17jdk/javadoc/doclet/testLinkOption/TestLinkOption.java 0000000 generic-all
18jdk/javadoc/doclet/T6735320/T6735320.java 0000000 generic-all
19jdk/javadoc/doclet/testValueTag/TestValueTag.java 0000000 generic-all
20jdk/javadoc/tool/modules/Modules.java 0000000 generic-all
21jdk/javadoc/doclet/testWarnings/TestWarnings.java 0000000 generic-all
22jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java 0000000 generic-all
23jdk/javadoc/tool/doclint/DocLintTest.java 0000000 generic-all
24jdk/javadoc/doclet/testBadPackageFileInJar/TestBadPackageFileInJar.java 0000000 generic-all
diff --git a/debian/tests/problems-s390x.txt b/debian/tests/problems-s390x.txt
0new file mode 10064425new file mode 100644
index 0000000..9e66dd1
--- /dev/null
+++ b/debian/tests/problems-s390x.txt
@@ -0,0 +1,3 @@
1# https://bugs.openjdk.org/browse/JDK-8309698
2runtime/NMT/VirtualAllocCommitMerge.java 000000 generic-all
3
diff --git a/debian/tests/write-problems b/debian/tests/write-problems
0new file mode 1007554new file mode 100755
index 0000000..434378f
--- /dev/null
+++ b/debian/tests/write-problems
@@ -0,0 +1,25 @@
1#!/bin/bash
2
3problem_list=$1
4upstream_problems=$2
5suite=$3
6
7cat ${upstream_problems} > ${problem_list}
8
9if [[ -f debian/tests/problems-${suite}.txt ]]; then
10 cat debian/tests/problems-${suite}.txt >> ${problem_list}
11fi
12
13distrel=`lsb_release --codename --short`
14if [[ -f debian/tests/problems-${distrel}.txt ]]; then
15 cat debian/tests/problems-${distrel}.txt >> ${problem_list}
16fi
17
18host_arch="${DEB_HOST_ARCH:-$(dpkg --print-architecture)}"
19if [[ -f debian/tests/problems-${host_arch}.txt ]]; then
20 cat debian/tests/problems-${host_arch}.txt >> ${problem_list}
21fi
22
23if [[ -f debian/tests/problems-${distrel}-${host_arch}.txt ]]; then
24 cat debian/tests/problems-${distrel}-${host_arch}.txt >> ${problem_list}
25fi

Subscribers

People subscribed via source and target branches