mirror of https://github.com/aminya/setup-cpp
fix: return the installInfo object from setupPipPack
This commit is contained in:
parent
ecb7cdd120
commit
e6a4d529fc
|
@ -1,12 +1,11 @@
|
|||
import { setupConan } from "../conan"
|
||||
import { testBin } from "../../utils/tests/test-helpers"
|
||||
import { InstallationInfo } from "../../utils/setup/setupBin"
|
||||
|
||||
jest.setTimeout(200000)
|
||||
describe("setup-conan", () => {
|
||||
it("should setup conan", async () => {
|
||||
const installInfo = await setupConan("", "", "")
|
||||
|
||||
await testBin("conan", ["--version"], (installInfo as InstallationInfo | undefined)?.binDir)
|
||||
await testBin("conan", ["--version"], installInfo.binDir)
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
import { setupGcovr } from "../gcovr"
|
||||
import { testBin } from "../../utils/tests/test-helpers"
|
||||
import { InstallationInfo } from "../../utils/setup/setupBin"
|
||||
|
||||
jest.setTimeout(200000)
|
||||
describe("setup-gcovr", () => {
|
||||
it("should setup gcovr", async () => {
|
||||
const installInfo = await setupGcovr("", "", "")
|
||||
await testBin("gcovr", ["--version"], (installInfo as InstallationInfo | undefined)?.binDir)
|
||||
await testBin("gcovr", ["--version"], installInfo.binDir)
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { setupPipPack } from "../utils/setup/setupPipPack"
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
export async function setupGcovr(version: string | undefined, _setupCppDir: string, _arch: string) {
|
||||
await setupPipPack("gcovr", version)
|
||||
export function setupGcovr(version: string | undefined, _setupCppDir: string, _arch: string) {
|
||||
return setupPipPack("gcovr", version)
|
||||
}
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
import { setupMeson } from "../meson"
|
||||
import { testBin } from "../../utils/tests/test-helpers"
|
||||
import { InstallationInfo } from "../../utils/setup/setupBin"
|
||||
|
||||
jest.setTimeout(200000)
|
||||
describe("setup-meson", () => {
|
||||
it("should setup meson", async () => {
|
||||
const installInfo = await setupMeson("", "", "")
|
||||
|
||||
await testBin("meson", ["--version"], (installInfo as InstallationInfo | undefined)?.binDir)
|
||||
await testBin("meson", ["--version"], installInfo.binDir)
|
||||
})
|
||||
})
|
||||
|
|
|
@ -44,5 +44,5 @@ export async function setupPipPack(name: string, version?: string) {
|
|||
}
|
||||
}
|
||||
|
||||
return binDir
|
||||
return { binDir }
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue