mirror of
https://github.com/Cheviiot/Vintner.git
synced 2026-08-03 15:57:24 +00:00
Cheviiot
738234186d
`vintner cl ...`, `vintner msbuild ...`, etc. now work without adding <dest>/bin/<arch> to PATH or relying on the same-directory symlinks `install` sets up there. wrapper.Run gained an explicit binDir parameter (empty string preserves the existing os.Executable()-based self-location for the ordinary multi-call/symlink case) so cmd/vintner's new runTool can point it at a resolved toolchain directory instead. Resolution order: VINTNER_BIN if set (same meaning as `env --bin` - point it at a <dest>/bin/<arch> directory directly, for a non-default --dest or a specific architecture), else <defaultToolchainDir>/bin/ <hostArch> - the layout a plain `vintner download && vintner install` with no --dest override produces. A missing toolchain gets a clear error pointing at both fixes, rather than bubbling up whatever wineenv.Load's env.json error looks like. Also fixed shell completion falling out of sync with the actual tool list: the bash/zsh scripts previously hand-copied tool/flag names (and had already gone stale once - --with-dxsdk was missing from the download flag completions since it was added). The tool name list is now generated from wrapper.ToolNames() instead of hand-maintained, and both scripts now complete tool names too, so `vintner <TAB>` suggests `cl`, `link`, `msbuild`, etc. alongside the management subcommands. Verified end-to-end with a minimal PATH (/usr/bin:/bin only, no toolchain dir on it at all): `vintner cl /nologo hello.c` compiled successfully, and `vintner msbuild -t:Rebuild ...` rebuilt the same real KMDF driver verified earlier this session - both via the default ~/.vintner/bin/<hostArch> resolution, no VINTNER_BIN override needed.
64 lines
1.4 KiB
Go
64 lines
1.4 KiB
Go
package wrapper
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/Cheviiot/vintner/internal/wineenv"
|
|
)
|
|
|
|
func TestSpecExeDir(t *testing.T) {
|
|
paths := &wineenv.Paths{
|
|
BinDir: "/bin-dir",
|
|
SDKBinDir: "/sdk-bin-dir",
|
|
MSBuildBinDir: "/msbuild-bin-dir",
|
|
}
|
|
for _, tc := range []struct {
|
|
name string
|
|
dir dirKind
|
|
want string
|
|
}{
|
|
{"dirBin", dirBin, "/bin-dir"},
|
|
{"dirSDK", dirSDK, "/sdk-bin-dir"},
|
|
{"dirMSBuild", dirMSBuild, "/msbuild-bin-dir"},
|
|
} {
|
|
s := spec{dir: tc.dir}
|
|
if got := s.exeDir(paths); got != tc.want {
|
|
t.Errorf("%s: exeDir() = %q, want %q", tc.name, got, tc.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestToolsAndNativeToolsAreDisjoint(t *testing.T) {
|
|
for name := range Tools {
|
|
if nativeTools[name] {
|
|
t.Errorf("%q is in both Tools and nativeTools", name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestEveryToolHasAnExeName(t *testing.T) {
|
|
for name, s := range Tools {
|
|
if s.exeName == "" {
|
|
t.Errorf("Tools[%q] has no exeName", name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestIsTool(t *testing.T) {
|
|
for name := range Tools {
|
|
if !IsTool(name) {
|
|
t.Errorf("IsTool(%q) = false, want true (it's in Tools)", name)
|
|
}
|
|
}
|
|
for name := range nativeTools {
|
|
if !IsTool(name) {
|
|
t.Errorf("IsTool(%q) = false, want true (it's in nativeTools)", name)
|
|
}
|
|
}
|
|
for _, name := range []string{"download", "install", "env", "version", "help", "completion", "frobnicate", ""} {
|
|
if IsTool(name) {
|
|
t.Errorf("IsTool(%q) = true, want false", name)
|
|
}
|
|
}
|
|
}
|