Skip to content

Commit c3448dc

Browse files
committed
use InputFiles instead of InputDirectories in VFSListFilestTasks as it also accepts an not existing input directory
1 parent b9c31f5 commit c3448dc

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

graalpython/com.oracle.graal.python.test/src/tests/standalone/test_standalone.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ def test_gradle_generated_app_external_resources(self):
296296
os.makedirs(src_dir, exist_ok=True)
297297
# copy hello.py
298298
shutil.copyfile(os.path.join(target_dir, "src", "main", "resources", "org.graalvm.python.vfs", "src", "hello.py"), os.path.join(src_dir, "hello.py"))
299-
shutil.rmtree(os.path.join(target_dir, "src", "main", "resources", "org.graalvm.python.vfs"))
299+
# remove all resources, we also want to check if the gradle plugin can deal with no user resources
300+
shutil.rmtree(os.path.join(target_dir, "src", "main", "resources"))
300301
# patch GraalPy.java
301302
util.replace_in_file(os.path.join(target_dir, "src", "main", "java", "org", "example", "GraalPy.java"),
302303
"package org.example;",
@@ -315,6 +316,16 @@ def test_gradle_generated_app_external_resources(self):
315316
out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir, gradle = True)
316317
util.check_ouput("BUILD SUCCESS", out)
317318

319+
# check java exec
320+
cmd = gradle_cmd + ["run"]
321+
out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir, gradle = True)
322+
util.check_ouput("hello java", out)
323+
324+
# prepare for native build
325+
meta_inf = os.path.join(target_dir, "src", "main", "resources", "META-INF", "native-image")
326+
os.makedirs(meta_inf, exist_ok=True)
327+
shutil.copyfile(os.path.join(self.test_prj_path, "src", "main", "resources", "META-INF", "native-image", "proxy-config.json"), os.path.join(meta_inf, "proxy-config.json"))
328+
318329
# gradle needs jdk <= 22, but it looks like the 'gradle nativeCompile' cmd does not complain if higher,
319330
# which is fine, because we need to build the native binary with a graalvm build
320331
# and the one we have set in JAVA_HOME is at least jdk24
@@ -328,12 +339,6 @@ def test_gradle_generated_app_external_resources(self):
328339
out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir)
329340
util.check_ouput("hello java", out)
330341

331-
# 2.) check java build and exec
332-
cmd = gradle_cmd + ["run"]
333-
out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir, gradle = True)
334-
util.check_ouput("BUILD SUCCESS", out)
335-
util.check_ouput("hello java", out)
336-
337342
@unittest.skipUnless(is_gradle_enabled, "ENABLE_GRADLE_STANDALONE_UNITTESTS is not true")
338343
def test_gradle_fail_without_graalpy_dep(self):
339344
with tempfile.TemporaryDirectory() as tmpdir:

graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/VFSFilesListTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.gradle.api.DefaultTask;
4545
import org.gradle.api.GradleScriptException;
4646
import org.gradle.api.provider.Property;
47-
import org.gradle.api.tasks.InputDirectory;
47+
import org.gradle.api.tasks.InputFiles;
4848
import org.gradle.api.tasks.TaskAction;
4949

5050
import java.io.File;
@@ -56,7 +56,7 @@
5656

5757
public abstract class VFSFilesListTask extends DefaultTask {
5858

59-
@InputDirectory
59+
@InputFiles
6060
public abstract Property<File> getResourcesDir();
6161

6262
@TaskAction

0 commit comments

Comments
 (0)