Skip to content

Commit 73e88ca

Browse files
committed
Windows: copy and all dll files
1 parent bf2f904 commit 73e88ca

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

test/integration/integration.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,18 @@ func (conf *CCppTestConf) Run(t *testing.T, envVars []string) {
247247
var testExecutable = path.Join(conf.Cmake.BuildDir, conf.Cmake.Name)
248248
if runtime.GOOS == "windows" {
249249
testExecutable = testExecutable + ".exe"
250-
assert.NoErr(t, comparison.CopyFile(
251-
path.Join(repoRoot(t), build.ObjectBoxCDir, "lib", "objectbox.dll"),
252-
path.Join(conf.Cmake.BuildDir, "objectbox.dll"),
253-
0))
250+
// Copy (and log) objectbox.dll and any other DLL files
251+
libDir := filepath.Join(repoRoot(t), build.ObjectBoxCDir, "lib")
252+
dllFiles, err := filepath.Glob(filepath.Join(libDir, "*.dll"))
253+
assert.NoErr(t, err)
254+
for _, dllFile := range dllFiles {
255+
dllName := filepath.Base(dllFile)
256+
t.Logf("Copying DLL: %s", dllName)
257+
assert.NoErr(t, comparison.CopyFile(
258+
dllFile,
259+
filepath.Join(conf.Cmake.BuildDir, dllName),
260+
0))
261+
}
254262
}
255263
var cmd = exec.Command(testExecutable)
256264
cmd.Dir = conf.Cmake.BuildDir

0 commit comments

Comments
 (0)