Skip to content

Commit b929746

Browse files
committed
Fixes for test.
Signed-off-by: Marcin Kuszczak <1508798+aartiPl@users.noreply.github.com>
1 parent 81c5fe9 commit b929746

6 files changed

Lines changed: 3 additions & 11 deletions

File tree

src/integration/kotlin/io/github/kscripting/kscript/integration/MiscTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ class MiscTest : TestBase {
9292

9393

9494
val envSetter = if (osType.isWindowsLike()) {
95-
"set KSCRIPT_DIRECTORY_ARTIFACTS=${shellPath.resolve("jarFiles")} &&"
95+
"set KSCRIPT_DIRECTORY_ARTIFACTS=${shellPath.resolve("jars")} &&"
9696
} else {
97-
"KSCRIPT_DIRECTORY_ARTIFACTS=${shellPath.resolve("jarFiles")}"
97+
"KSCRIPT_DIRECTORY_ARTIFACTS=${shellPath.resolve("jars")}"
9898
}
9999

100100
verify(
101-
"$envSetter kscript -d ${shellPath.resolve("script_with_local_jars.kts")}",
101+
"$envSetter kscript ${shellPath.resolve("script_with_local_jars.kts")}",
102102
0,
103103
"I am living in Test1 class...\nAnd I come from Test2 class...\n",
104104
""

src/main/kotlin/io/github/kscripting/kscript/KscriptHandler.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@ import io.github.kscripting.kscript.resolver.ScriptResolver
1111
import io.github.kscripting.kscript.resolver.SectionResolver
1212
import io.github.kscripting.kscript.util.Executor
1313
import io.github.kscripting.kscript.util.FileUtils.getArtifactsRecursively
14-
import io.github.kscripting.kscript.util.Logger.devMsg
1514
import io.github.kscripting.kscript.util.Logger.info
1615
import io.github.kscripting.kscript.util.Logger.infoMsg
1716
import io.github.kscripting.kscript.util.Logger.warnMsg
1817
import io.github.kscripting.shell.model.ScriptType
19-
import io.github.kscripting.shell.model.toNativePath
2018
import java.net.URI
21-
import kotlin.io.path.listDirectoryEntries
2219

2320
class KscriptHandler(
2421
private val executor: Executor, private val config: Config, private val options: Map<String, String>
@@ -74,11 +71,6 @@ class KscriptHandler(
7471
}
7572

7673
val resolvedDependencies = cache.getOrCreateDependencies(script.digest) {
77-
devMsg("Local artifacts dir: ${config.scriptingConfig.artifactsDir}")
78-
devMsg("Content of dir:\n ${config.scriptingConfig.artifactsDir?.toNativePath()?.listDirectoryEntries()}")
79-
devMsg("Artifacts read: ${if (config.scriptingConfig.artifactsDir != null) getArtifactsRecursively(config.scriptingConfig.artifactsDir).toString() else ""}")
80-
81-
8274
val localArtifacts = if (config.scriptingConfig.artifactsDir != null) {
8375
getArtifactsRecursively(config.scriptingConfig.artifactsDir)
8476
} else emptyList()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)