Skip to content

Commit ff8bab2

Browse files
committed
Do not run memory checks in build with llvm 5.0
1 parent 70589eb commit ff8bab2

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

build.sbt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
import scala.sys.process._
22

33
addCommandAlias("verify", "; ^test:compile ; ^test ; ^scripted ; docs/makeSite")
4+
addCommandAlias(
5+
"verifyWithoutMemoryChecks",
6+
"; " +
7+
"^test:compile ; " +
8+
"^testOnly -- -z \"should exist\" -z \"correct bindings\" ; " +
9+
"^scripted ; " +
10+
"docs/makeSite")
411

512
val Versions = new {
613
val scala210 = "2.10.6"

scripts/test.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@ if [[ ! -e bindgen/target/.llvm-version ]] || [[ "$(<bindgen/target/.llvm-versio
1313
fi
1414

1515
make -C bindgen/target
16-
sbt "${@:-verify}"
16+
if [[ "${LLVM_VERSION}" == "5.0" ]]; then
17+
sbt "${@:-verify}"
18+
else
19+
sbt "${@:-verifyWithoutMemoryChecks}"
20+
fi

tests/src/test/scala/org/scalanative/bindgen/BindgenSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class BindgenSpec extends FunSpec {
5151
}
5252

5353
for (input <- inputDirectory.listFiles() if input.getName.endsWith(".h")) {
54-
it(s"should generate bindings for ${input.getName}") {
54+
it(s"should generate correct bindings for ${input.getName}") {
5555
val testName = input.getName.replace(".h", "")
5656
val expected = new File(inputDirectory, testName + ".scala")
5757
val output = new File(outputDir, testName + ".scala")

0 commit comments

Comments
 (0)