Skip to content

Commit c7b1826

Browse files
committed
vtd: Add vtd-launch script to conan package
1 parent e376be1 commit c7b1826

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed
File renamed without changes.

plugins/vtd/conanfile.py

+4
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,7 @@ def build(self):
7272
def package(self):
7373
cmake = self._configure_cmake()
7474
cmake.install()
75+
self.copy("vtd-launch", dst="bin", src=f"{self.source_folder}/bin")
76+
77+
def package_info(self):
78+
self.env_info.VTD_LAUNCH = f"{self.package_folder}/bin/vtd-launch"

tests/bootstrap_vtd.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"hooks": {
55
"pre_connect": [
66
{
7-
"path": "../plugins/vtd/bin/vtd",
7+
"path": "${VTD_LAUNCH}",
88
"args": [
99
"stop"
1010
]
1111
},
1212
{
13-
"path": "../plugins/vtd/bin/vtd",
13+
"path": "${VTD_LAUNCH}",
1414
"args": [
1515
"start",
1616
"--vtd-setup", "${THIS_STACKFILE_DIR}/../plugins/vtd/contrib/setups/Cloe.noGUInoIG",
@@ -19,7 +19,7 @@
1919
}
2020
],
2121
"post_disconnect": [
22-
{ "path": "../plugins/vtd/bin/vtd", "args": ["stop"] }
22+
{ "path": "${VTD_LAUNCH}", "args": ["stop"] }
2323
]
2424
}
2525
}

tests/test_vtd.bats

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
load setup_bats
44

55
teardown_vtd() {
6-
# CLOE_ROOT is only available outside the shell.
7-
cloe_shell -c "${CLOE_ROOT}/plugins/vtd/bin/vtd stop"
6+
# VTD_LAUNCH is only available in the shell.
7+
cloe_shell -c '${VTD_LAUNCH} stop'
88
}
99

1010
test_vtd_plugin_exists() {

0 commit comments

Comments
 (0)