@@ -680,6 +680,8 @@ class GraalPythonTags(object):
680
680
unittest_hpy_sandboxed = 'python-unittest-hpy-sandboxed'
681
681
unittest_posix = 'python-unittest-posix'
682
682
unittest_standalone = 'python-unittest-standalone'
683
+ unittest_gradle_plugin = 'python-unittest-gradle-plugin'
684
+ unittest_maven_plugin = 'python-unittest-maven-plugin'
683
685
ginstall = 'python-ginstall'
684
686
tagged = 'python-tagged-unittest'
685
687
svmunit = 'python-svm-unittest'
@@ -1379,12 +1381,7 @@ def graalpython_gate_runner(args, tasks):
1379
1381
standalone_home = graalpy_standalone_home ('jvm' )
1380
1382
mvn_repo_path , version , env = deploy_local_maven_repo ()
1381
1383
1382
- # in order to run gradle we need a jdk <= 22
1383
- env ['GRADLE_JAVA_HOME' ] = env .get ('JAVA_HOME' )
1384
-
1385
1384
env ['ENABLE_STANDALONE_UNITTESTS' ] = 'true'
1386
- env ['ENABLE_GRADLE_PLUGIN_UNITTESTS' ] = 'true'
1387
- env ['ENABLE_MAVEN_PLUGIN_UNITTESTS' ] = 'true'
1388
1385
env ['ENABLE_JBANG_INTEGRATION_UNITTESTS' ] = 'true'
1389
1386
env ['JAVA_HOME' ] = gvm_jdk
1390
1387
env ['PYTHON_STANDALONE_HOME' ] = standalone_home
@@ -1395,14 +1392,6 @@ def graalpython_gate_runner(args, tasks):
1395
1392
mx_urlrewrites .rewriteurl ('https://repo1.maven.org/maven2/' ),
1396
1393
])
1397
1394
1398
- urls = get_wrapper_urls ("graalpython/com.oracle.graal.python.test/src/tests/standalone/mvnw/.mvn/wrapper/maven-wrapper.properties" , ["distributionUrl" ])
1399
- if "distributionUrl" in urls :
1400
- env ["MAVEN_DISTRIBUTION_URL_OVERRIDE" ] = mx_urlrewrites .rewriteurl (urls ["distributionUrl" ])
1401
-
1402
- urls = get_wrapper_urls ("graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/gradle-test-project/gradle/wrapper/gradle-wrapper.properties" , ["distributionUrl" ])
1403
- if "distributionUrl" in urls :
1404
- env ["GRADLE_DISTRIBUTION_URL_OVERRIDE" ] = mx_urlrewrites .rewriteurl (urls ["distributionUrl" ])
1405
-
1406
1395
env ["org.graalvm.maven.downloader.version" ] = version
1407
1396
env ["org.graalvm.maven.downloader.repository" ] = f"{ pathlib .Path (mvn_repo_path ).as_uri ()} /"
1408
1397
@@ -1416,7 +1405,74 @@ def graalpython_gate_runner(args, tasks):
1416
1405
mx .logv (f"running with os.environ extended with: { env = } " )
1417
1406
run_python_unittests (
1418
1407
os .path .join (standalone_home , 'bin' , _graalpy_launcher ()),
1419
- paths = ["graalpython/com.oracle.graal.python.test/src/tests/standalone" ],
1408
+ paths = ["graalpython/com.oracle.graal.python.test/src/tests/standalone/test_jbang_integration.py" ,
1409
+ "graalpython/com.oracle.graal.python.test/src/tests/standalone/test_standalone.py" ],
1410
+ env = env ,
1411
+ parallel = 3 ,
1412
+ )
1413
+
1414
+ with Task ('GraalPython gradle plugin tests' , tasks , tags = [GraalPythonTags .unittest_gradle_plugin ]) as task :
1415
+ if task :
1416
+ gvm_jdk = graalvm_jdk ()
1417
+ standalone_home = graalpy_standalone_home ('jvm' )
1418
+ mvn_repo_path , version , env = deploy_local_maven_repo ()
1419
+
1420
+ env ['ENABLE_GRADLE_PLUGIN_UNITTESTS' ] = 'true'
1421
+ env ['JAVA_HOME' ] = gvm_jdk
1422
+ env ['PYTHON_STANDALONE_HOME' ] = standalone_home
1423
+
1424
+ # setup maven downloader overrides
1425
+ env ['MAVEN_REPO_OVERRIDE' ] = "," .join ([
1426
+ f"{ pathlib .Path (mvn_repo_path ).as_uri ()} /" ,
1427
+ mx_urlrewrites .rewriteurl ('https://repo1.maven.org/maven2/' ),
1428
+ ])
1429
+
1430
+ urls = get_wrapper_urls ("graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/gradle-test-project/gradle/wrapper/gradle-wrapper.properties" , ["distributionUrl" ])
1431
+ if "distributionUrl" in urls :
1432
+ env ["GRADLE_DISTRIBUTION_URL_OVERRIDE" ] = mx_urlrewrites .rewriteurl (urls ["distributionUrl" ])
1433
+
1434
+ env ["org.graalvm.maven.downloader.version" ] = version
1435
+ env ["org.graalvm.maven.downloader.repository" ] = f"{ pathlib .Path (mvn_repo_path ).as_uri ()} /"
1436
+
1437
+ # run the test
1438
+ mx .logv (f"running with os.environ extended with: { env = } " )
1439
+
1440
+ run_python_unittests (
1441
+ os .path .join (standalone_home , 'bin' , _graalpy_launcher ()),
1442
+ paths = ["graalpython/com.oracle.graal.python.test/src/tests/standalone/test_gradle_plugin.py" ],
1443
+ env = env ,
1444
+ parallel = 3 ,
1445
+ )
1446
+
1447
+ with Task ('GraalPython maven plugin tests' , tasks , tags = [GraalPythonTags .unittest_maven_plugin ]) as task :
1448
+ if task :
1449
+ gvm_jdk = graalvm_jdk ()
1450
+ standalone_home = graalpy_standalone_home ('jvm' )
1451
+ mvn_repo_path , version , env = deploy_local_maven_repo ()
1452
+
1453
+ env ['ENABLE_MAVEN_PLUGIN_UNITTESTS' ] = 'true'
1454
+ env ['JAVA_HOME' ] = gvm_jdk
1455
+ env ['PYTHON_STANDALONE_HOME' ] = standalone_home
1456
+
1457
+ # setup maven downloader overrides
1458
+ env ['MAVEN_REPO_OVERRIDE' ] = "," .join ([
1459
+ f"{ pathlib .Path (mvn_repo_path ).as_uri ()} /" ,
1460
+ mx_urlrewrites .rewriteurl ('https://repo1.maven.org/maven2/' ),
1461
+ ])
1462
+
1463
+ urls = get_wrapper_urls ("graalpython/com.oracle.graal.python.test/src/tests/standalone/mvnw/.mvn/wrapper/maven-wrapper.properties" , ["distributionUrl" ])
1464
+ if "distributionUrl" in urls :
1465
+ env ["MAVEN_DISTRIBUTION_URL_OVERRIDE" ] = mx_urlrewrites .rewriteurl (urls ["distributionUrl" ])
1466
+
1467
+ env ["org.graalvm.maven.downloader.version" ] = version
1468
+ env ["org.graalvm.maven.downloader.repository" ] = f"{ pathlib .Path (mvn_repo_path ).as_uri ()} /"
1469
+
1470
+ # run the test
1471
+ mx .logv (f"running with os.environ extended with: { env = } " )
1472
+
1473
+ run_python_unittests (
1474
+ os .path .join (standalone_home , 'bin' , _graalpy_launcher ()),
1475
+ paths = ["graalpython/com.oracle.graal.python.test/src/tests/standalone/test_maven_plugin.py" ],
1420
1476
env = env ,
1421
1477
parallel = 3 ,
1422
1478
)
0 commit comments