Skip to content

Commit e38a56d

Browse files
eed3si9need3si9n
committed
Use globs for scripted tests
1 parent 3e30ef1 commit e38a56d

File tree

13 files changed

+44
-28
lines changed

13 files changed

+44
-28
lines changed

‎build.sbt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,19 @@ addCommandAlias("validateWindows", "; testOnly * -- -n windows ; scripted univer
141141
addCommandAlias("validateJlink", "scripted jlink/*")
142142

143143
addCommandAlias("ci-release", "release with-defaults")
144+
145+
// So that publishLocal doesn't continuously create new versions
146+
def versionFmt(out: sbtdynver.GitDescribeOutput): String = {
147+
val snapshotSuffix =
148+
if (out.isSnapshot()) "-SNAPSHOT"
149+
else ""
150+
out.ref.dropPrefix + snapshotSuffix
151+
}
152+
153+
def fallbackVersion(d: java.util.Date): String = s"HEAD-${sbtdynver.DynVer timestamp d}"
154+
155+
ThisBuild / version := dynverGitDescribeOutput.value.mkVersion(versionFmt, fallbackVersion(dynverCurrentDate.value))
156+
ThisBuild / dynver := {
157+
val d = new java.util.Date
158+
sbtdynver.DynVer.getGitDescribeOutput(d).mkVersion(versionFmt, fallbackVersion(d))
159+
}

‎src/sbt-test/universal/clear-stage-dir/test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Stage the distribution and ensure files show up.
22
> Universal/stage
3-
$ exists target/universal/stage/conf/test
4-
$ exists target/universal/stage/conf/test2
3+
$ exists target/**/universal/stage/conf/test
4+
$ exists target/**/universal/stage/conf/test2
55
$ delete src/universal/conf/test2
66
> Universal/stage
7-
$ exists target/universal/stage/conf/test
8-
$ absent target/universal/stage/conf/test2
7+
$ exists target/**/universal/stage/conf/test
8+
$ absent target/**/universal/stage/conf/test2
99

‎src/sbt-test/universal/dist/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Create the distribution and ensure files show up.
22
> dist
3-
$ exists target/universal/simple-test-0.1.0.zip
3+
$ exists target/**/universal/simple-test-0.1.0.zip

‎src/sbt-test/universal/multiproject-classifiers/test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Run the staging and check the script.
22
> stage
33
> showFiles
4-
$ exists target/universal/stage/lib/org.test.sub-1.0.jar
5-
$ exists target/universal/stage/lib/org.test.sub-1.0-assets.jar
4+
$ exists target/**/universal/stage/lib/org.test.sub-1.0.jar
5+
$ exists target/**/universal/stage/lib/org.test.sub-1.0-assets.jar

‎src/sbt-test/universal/staging-custom-main/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Stage the distribution and ensure main class can be run.
22
> show Universal/packageBin
3-
$ exists target/universal/stage-custom-main-0.1.0.zip
3+
$ exists target/**/universal/stage-custom-main-0.1.0.zip
44
> unzip
55
$ exists stage-custom-main-0.1.0/bin/
66
$ exists stage-custom-main-0.1.0/bin/stage-custom-main

‎src/sbt-test/universal/staging/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Stage the distribution and ensure files show up.
22
> show Universal/stage
3-
$ exists target/universal/stage/conf/test
3+
$ exists target/**/universal/stage/conf/test

‎src/sbt-test/universal/test-executableScriptName/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Run the zip packaging.
22
> show Universal/packageBin
3-
$ exists target/universal/simple-test-0.1.0.zip
3+
$ exists target/**/universal/simple-test-0.1.0.zip
44
> unzip
55
$ exists simple-test-0.1.0/bin/
66
$ exists simple-test-0.1.0/bin/simple-exec

‎src/sbt-test/universal/test-mapping-helpers/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Run the universal packaging.
22
> show Universal/packageBin
3-
$ exists target/universal/simple-test-0.1.0.zip
3+
$ exists target/**/universal/simple-test-0.1.0.zip
44

55
> unzip
66
$ exists simple-test-0.1.0/

‎src/sbt-test/universal/test-native-zip/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Run the zip packaging.
22
> show Universal/packageBin
3-
$ exists target/universal/simple-test-0.1.0.zip
3+
$ exists target/**/universal/simple-test-0.1.0.zip
44

55
# TODO - Check contents of zips. Ensure file permissions are preserved.

‎src/sbt-test/universal/test-packageName/test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Run the zip packaging.
22
> show Universal/packageBin
3-
$ exists target/universal/simple-package.zip
3+
$ exists target/**/universal/simple-package.zip
44

55
# Run the tgz packaging.
66
> Universal/packageZipTarball
7-
$ exists target/universal/simple-package.tgz
7+
$ exists target/**/universal/simple-package.tgz
88

99
# Run the txz packaging.
1010
> Universal/packageXzTarball
11-
$ exists target/universal/simple-package.txz
11+
$ exists target/**/universal/simple-package.txz

‎src/sbt-test/universal/test-zips-no-top-level-dir/test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Run the zip packaging.
22
> show Universal/packageBin
3-
$ exists target/universal/simple-test-0.1.0.zip
3+
$ exists target/**/universal/simple-test-0.1.0.zip
44

55
# Run the tgz packaging.
66
> Universal/packageZipTarball
7-
$ exists target/universal/simple-test-0.1.0.tgz
7+
$ exists target/**/universal/simple-test-0.1.0.tgz
88

99
# Run the txz packaging.
1010
> Universal/packageXzTarball
11-
$ exists target/universal/simple-test-0.1.0.txz
11+
$ exists target/**/universal/simple-test-0.1.0.txz
1212

1313

1414
# TODO - Check contents of zips

‎src/sbt-test/universal/test-zips/test

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
# Run the zip packaging.
22
> show Universal/packageBin
3-
$ exists target/universal/simple-test-0.1.0.zip
3+
$ exists target/**/universal/simple-test-0.1.0.zip
44
> UniversalDocs/packageBin
5-
$ exists target/universal-docs/simple-test-0.1.0.zip
5+
$ exists target/**/universal-docs/simple-test-0.1.0.zip
66
> UniversalSrc/packageBin
7-
$ exists target/universal-src/simple-test-0.1.0.zip
7+
$ exists target/**/universal-src/simple-test-0.1.0.zip
88

99
# Run the tgz packaging.
1010
> Universal/packageZipTarball
11-
$ exists target/universal/simple-test-0.1.0.tgz
11+
$ exists target/**/universal/simple-test-0.1.0.tgz
1212
> UniversalDocs/packageZipTarball
13-
$ exists target/universal-docs/simple-test-0.1.0.tgz
13+
$ exists target/**/universal-docs/simple-test-0.1.0.tgz
1414
> UniversalSrc/packageZipTarball
15-
$ exists target/universal-src/simple-test-0.1.0.tgz
15+
$ exists target/**/universal-src/simple-test-0.1.0.tgz
1616

1717
# Run the txz packaging.
1818
> Universal/packageXzTarball
19-
$ exists target/universal/simple-test-0.1.0.txz
19+
$ exists target/**/universal/simple-test-0.1.0.txz
2020
> UniversalDocs/packageXzTarball
21-
$ exists target/universal-docs/simple-test-0.1.0.txz
21+
$ exists target/**/universal-docs/simple-test-0.1.0.txz
2222
> UniversalSrc/packageXzTarball
23-
$ exists target/universal-src/simple-test-0.1.0.txz
23+
$ exists target/**/universal-src/simple-test-0.1.0.txz
2424

2525

2626
# TODO - Check contents of zips

‎src/sbt-test/universal/validation/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
$ mkdir src/universal
44
$ copy-file build.sbt src/universal/test-file
55
> Universal/packageBin
6-
$ exists target/universal/simple-test-0.1.0.zip
6+
$ exists target/**/universal/simple-test-0.1.0.zip

0 commit comments

Comments
 (0)