[gentoo-commits] proj/java-config:master commit in: tests/testsuite/, /

[gentoo-commits] proj/java-config:master commit in: tests/testsuite/, /

[Patrice Clement]

commit:     715f758a8976a98d08f58aa819794134728a93cb
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 20:34:19 2020 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 20:34:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/java-config.git/commit/?id=715f758a

update arches in setup.py

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 setup.py                   | 18 ++----------------
 tests/testsuite/Virtual.py |  4 ++--
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/setup.py b/setup.py
index ea08bf1..c1dd9a0 100644
--- a/setup.py
+++ b/setup.py
@@ -71,30 +71,16 @@ class jc_install(install):
 		arch = os.getenv('ARCH', 'unknown')
 		defaults = '*= icedtea'
 		if arch in ['amd64', 'x86']:
-			defaults = '*= icedtea6 icedtea6-bin sun-jdk blackdown-jdk ibm-jdk-bin jrockit-jdk-bin'
+			defaults = '*= icedtea6 icedtea6-bin icedtea7 icedtea7-bin'
 		elif arch in ['ppc-macos', 'x64-macos', 'x86-macos']:
 			defaults = '*= apple-jdk-bin'
-		elif arch in ['amd64-fbsd', 'x86-fbsd', 'x64-freebsd', 'x86-freebsd']:
-			defaults = '*= diablo-jdk'
-		elif arch in ['sparc-solaris', 'sparc64-solaris', 'x64-solaris', 'x86-solaris']:
-			defaults = '*= sun-jdk'
-		elif arch in ['mips', 'sparc']:
-			defaults = '*= blackdown-jdk'
 		elif arch in ['ppc', 'ppc64', 'ppc-linux', 'ppc-aix']:
 			defaults = '*= ibm-jdk-bin'
-		elif arch in ['alpha']:
-			defaults = '*= compaq-jdk'
 		elif arch in ['arm']:
 			defaults = '*= icedtea-7 icedtea-6 icedtea-bin-7 icedtea-bin-6'
-		elif arch in ['ia64']:
-			defaults = '*= jrockit-jdk-bin'
-		elif arch in ['hppa']:
-			defaults = '*= kaffe'
-		elif arch in ['hpux']:
-			defaults = '*= hp-jdk-bin'
 
 		with tempfile.NamedTemporaryFile(mode='w', delete=False) as f:
-			f.write("# This files contain the default support jdk's\n")
+			f.write("# Supported JDKs\n")
 			f.write(defaults + "\n")
 		confdir = self.root + '/usr/share/java-config-2/config/'
 		self.mkpath(confdir)

diff --git a/tests/testsuite/Virtual.py b/tests/testsuite/Virtual.py
index 3db1561..4027e1f 100644
--- a/tests/testsuite/Virtual.py
+++ b/tests/testsuite/Virtual.py
@@ -16,7 +16,7 @@ class TestVirtual(unittest.TestCase):
 
     def test_get_vms(self):
         self.assertEqual(self.jaf.get_vms(), ['sun-jdk-1.6'])
-    
+
     def test_load_vms(self):
         self.assertEqual( self.jmx._vms, ['ibm-jdk-bin-1.5', 'sun-jdk-1.6' , \
             'sun-jdk-1.7', 'sun-jre-bin-1.6'] )
@@ -30,7 +30,7 @@ class TestMultiProviderVirtual(unittest.TestCase):
         em.set_active_vm(em.get_vm('sun-jdk-1.6'))
 
         self.jdbc = em.get_virtual('jdbc')
-    
+
     def test_classpath_multiple(self):
         self.assertEqual( len(self.jdbc.classpath().split(':')), 2)