Skip to content

Commit ec234aa

Browse files
committed
Try to fix tests
1 parent be561b7 commit ec234aa

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

test/trimming/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ $(BIN)/capplication$(EXE): $(SRCDIR)/capplication.c $(SRCDIR)/libsimple.h $(BIN)
6161
$(CC) -I$(BIN) -I$(SRCDIR) -I$(JULIA_LIBDIR) -o $@ $< -Wl,--whole-archive $(BIN)/libsimple-o.a -Wl,--no-whole-archive $(LDFLAGS_ADD) $(LDFLAGS) $(CPPFLAGS_ADD) $(CPPFLAGS) $(CFLAGS_ADD) $(CFLAGS)
6262

6363
check: $(BIN)/hello$(EXE) $(BIN)/trimmability$(EXE) $(BIN)/basic_jll$(EXE) $(BIN)/capplication$(EXE)
64-
$(JULIA) --depwarn=error $(SRCDIR)/trimming.jl $<
64+
$(JULIA) --startup-file=no --history-file=no --depwarn=error --project=$(SRCDIR) $(SRCDIR)/trimming.jl $<
6565

6666
clean:
6767
-rm -f $(BIN)/hello$(EXE) $(BIN)/trimmability$(EXE) $(BIN)/basic_jll$(EXE) $(BIN)/hello-o.a $(BIN)/trimmability-o.a $(BIN)/basic_jll-o.a $(BIN)/libsimple-o.a $(BIN)/libsimple.$(SHLIB_EXT) $(BIN)/capplication$(EXE) $(BIN)/bindinginfo_libsimple.json

test/trimming/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[deps]
22
JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
3+
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
34
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
45
Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
56

test/trimming/trimming.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Pkg
22

3-
Pkg.add(["JSON"])
3+
Pkg.instantiate()
44

55
using Test
66
using JSON
@@ -41,6 +41,7 @@ let exe_suffix = splitext(Base.julia_exename())[2]
4141
@test any(Bool[func["symbol"] == "copyto_and_sum" for func in abi["functions"]])
4242

4343
# `CVector{Float32}` should have been exported with the correct info
44+
@show abi["types"]
4445
@test any(Bool[type["name"] == "CVector{Float32}" for type in abi["types"]])
4546
CVector_Float32 = abi["types"][findfirst(type["name"] == "CVector{Float32}" for type in abi["types"])]
4647
@test length(CVector_Float32["fields"]) == 2

0 commit comments

Comments
 (0)