mirror of
https://github.com/sbt/sbt.git
synced 2026-09-03 05:33:03 +02:00
Partition system and app args to bootstrapped executable (#852)
This commit is contained in:
committed by
Alexandre Archambault
parent
a5b0424c08
commit
e4f40b6a1d
+12
-2
@@ -136,6 +136,11 @@ testBootstrap() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$(./cs-echo-launcher -J-Dother=thing foo -J-Dfoo=baz)" != foo ]; then
|
||||
echo "Error: unexpected output from bootstrapped echo command (generated by proguarded launcher)." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# run via the launcher rather than via the sbt-pack scripts, because the latter interprets -Dfoo=baz itself
|
||||
# rather than passing it to coursier since https://github.com/xerial/sbt-pack/pull/118
|
||||
./coursier-test bootstrap -o cs-props -D other=thing -J -Dfoo=baz io.get-coursier:props:1.0.2
|
||||
@@ -150,6 +155,11 @@ testBootstrap() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$(./cs-props -J-Dhappy=days happy)" != days ]; then
|
||||
echo "Error: unexpected output from bootstrapped props command." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# assembly tests
|
||||
./coursier-test bootstrap -a -o cs-props-assembly -D other=thing -J -Dfoo=baz io.get-coursier:props:1.0.2
|
||||
local OUT="$(./cs-props-assembly foo)"
|
||||
@@ -192,6 +202,8 @@ if isScalaJs; then
|
||||
jsCompile
|
||||
runJsTests
|
||||
else
|
||||
testBootstrap
|
||||
|
||||
testNativeBootstrap
|
||||
|
||||
integrationTestsRequirements
|
||||
@@ -208,8 +220,6 @@ else
|
||||
else
|
||||
runJvmTests
|
||||
|
||||
testBootstrap
|
||||
|
||||
validateReadme
|
||||
checkBinaryCompatibility
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user