diff --git a/buckaroo-tests/Manifest.fs b/buckaroo-tests/Manifest.fs index 0240f26..afb9179 100644 --- a/buckaroo-tests/Manifest.fs +++ b/buckaroo-tests/Manifest.fs @@ -1,11 +1,8 @@ module Buckaroo.Tests.Manifest -open System open Xunit open FSharpx -open Buckaroo -open Buckaroo.Tests open Buckaroo open Buckaroo.Tests diff --git a/buckaroo-tests/Paths.fs b/buckaroo-tests/Paths.fs index 63af8ba..f050a9f 100644 --- a/buckaroo-tests/Paths.fs +++ b/buckaroo-tests/Paths.fs @@ -5,26 +5,25 @@ open System.IO open Xunit open Buckaroo -let private sep = new String([| Path.DirectorySeparatorChar |]) - +let private sep = String [| Path.DirectorySeparatorChar |] [] -let ``Paths.normalize works correctly`` () = +let ``Paths.normalize works correctly`` () = let cases = [ - (".", ""); - ("a", "a"); - ("a" + sep + "", "a" + sep + ""); - ("" + sep + "a" + sep + "", "" + sep + "a" + sep + ""); - ("a" + sep + " " + sep + "b", "a" + sep + " " + sep + "b"); - ("" + sep + "a" + sep + "", "" + sep + "a" + sep + ""); - ("b", "a" + sep + ".." + sep + "b"); - ("c" + sep + "d", "a" + sep + ".." + sep + "b" + sep + ".." + sep + "c" + sep + "." + sep + "." + sep + "." + sep + "d"); - (".." + sep + ".." + sep + ".." + sep + "a" + sep + "b" + sep + "c", ".." + sep + ".." + sep + ".." + sep + "a" + sep + "b" + sep + "c"); - (".." + sep + ".." + sep + ".." + sep + "a", ".." + sep + ".." + sep + ".." + sep + "." + sep + "a"); + (".", ""); + ("a", "a"); + ("a" + sep + "", "a" + sep + ""); + ("" + sep + "a" + sep + "", "" + sep + "a" + sep + ""); + ("a" + sep + " " + sep + "b", "a" + sep + " " + sep + "b"); + ("" + sep + "a" + sep + "", "" + sep + "a" + sep + ""); + ("b", "a" + sep + ".." + sep + "b"); + ("c" + sep + "d", "a" + sep + ".." + sep + "b" + sep + ".." + sep + "c" + sep + "." + sep + "." + sep + "." + sep + "d"); + (".." + sep + ".." + sep + ".." + sep + "a" + sep + "b" + sep + "c", ".." + sep + ".." + sep + ".." + sep + "a" + sep + "b" + sep + "c"); + (".." + sep + ".." + sep + ".." + sep + "a", ".." + sep + ".." + sep + ".." + sep + "." + sep + "a"); ( - ".." + sep + ".." + sep + ".." + sep + ".." + sep + ".." + sep + ".." + sep + "buckaroo" + sep + "github" + sep + "buckaroo-pm" + sep + "pkg-config-cairo", + ".." + sep + ".." + sep + ".." + sep + ".." + sep + ".." + sep + ".." + sep + "buckaroo" + sep + "github" + sep + "buckaroo-pm" + sep + "pkg-config-cairo", ".." + sep + ".." + sep + ".." + sep + ".." + sep + ".." + sep + ".." + sep + "." + sep + "buckaroo" + sep + "github" + sep + "buckaroo-pm" + sep + "pkg-config-cairo" - ); + ); ] for (expected, input) in cases do diff --git a/buckaroo-tests/Solver.fs b/buckaroo-tests/Solver.fs index 888b1eb..704218c 100644 --- a/buckaroo-tests/Solver.fs +++ b/buckaroo-tests/Solver.fs @@ -123,6 +123,7 @@ let solve (partial : Solution) (cookBook : CookBook) (lockBookEntries : LockBook let lockBook = lockBookOf lockBookEntries let console = ConsoleManager (LoggingLevel.Silent) let context : TaskContext = { + BuildSystem = BuildSystem.Bazel Console = console DownloadManager = DownloadManager(console, "/tmp") GitManager = new GitManager(CacheFirst, console, new GitCli(console), "/tmp")