From 8633b86c6b24dafabc165749bc526232c803e724 Mon Sep 17 00:00:00 2001
From: Quinton Miller <nicetas.c@gmail.com>
Date: Thu, 31 Oct 2024 18:13:17 +0800
Subject: [PATCH] fix `lib_spec`

---
 spec/compiler/interpreter/lib_spec.cr       | 35 ++++++++++-----------
 src/compiler/crystal/interpreter/context.cr |  2 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/spec/compiler/interpreter/lib_spec.cr b/spec/compiler/interpreter/lib_spec.cr
index 2c1798645645..33af58929f16 100644
--- a/spec/compiler/interpreter/lib_spec.cr
+++ b/spec/compiler/interpreter/lib_spec.cr
@@ -19,12 +19,24 @@ private def ldflags_with_backtick
 end
 
 describe Crystal::Repl::Interpreter do
-  context "variadic calls" do
-    before_all do
-      FileUtils.mkdir_p(SPEC_CRYSTAL_LOADER_LIB_PATH)
-      build_c_dynlib(compiler_datapath("interpreter", "sum.c"))
-    end
+  before_all do
+    FileUtils.mkdir_p(SPEC_CRYSTAL_LOADER_LIB_PATH)
+    build_c_dynlib(compiler_datapath("interpreter", "sum.c"))
+
+    {% if flag?(:win32) %}
+      ENV["PATH"] = "#{SPEC_CRYSTAL_LOADER_LIB_PATH}#{Process::PATH_DELIMITER}#{ENV["PATH"]}"
+    {% end %}
+  end
+
+  after_all do
+    {% if flag?(:win32) %}
+      ENV["PATH"] = ENV["PATH"].delete_at(0, ENV["PATH"].index!(Process::PATH_DELIMITER) + 1)
+    {% end %}
+
+    FileUtils.rm_rf(SPEC_CRYSTAL_LOADER_LIB_PATH)
+  end
 
+  context "variadic calls" do
     it "promotes float" do
       interpret(<<-CRYSTAL).should eq 3.5
         @[Link(ldflags: #{ldflags.inspect})]
@@ -65,18 +77,9 @@ describe Crystal::Repl::Interpreter do
         LibSum.sum_int(2, E::ONE, F::FOUR)
         CRYSTAL
     end
-
-    after_all do
-      FileUtils.rm_rf(SPEC_CRYSTAL_LOADER_LIB_PATH)
-    end
   end
 
   context "command expansion" do
-    before_all do
-      FileUtils.mkdir_p(SPEC_CRYSTAL_LOADER_LIB_PATH)
-      build_c_dynlib(compiler_datapath("interpreter", "sum.c"))
-    end
-
     it "expands ldflags" do
       interpret(<<-CRYSTAL).should eq 4
         @[Link(ldflags: #{ldflags_with_backtick.inspect})]
@@ -87,9 +90,5 @@ describe Crystal::Repl::Interpreter do
         LibSum.simple_sum_int(2, 2)
         CRYSTAL
     end
-
-    after_all do
-      FileUtils.rm_rf(SPEC_CRYSTAL_LOADER_LIB_PATH)
-    end
   end
 end
diff --git a/src/compiler/crystal/interpreter/context.cr b/src/compiler/crystal/interpreter/context.cr
index 50e36a3ff8b7..749af210e9ac 100644
--- a/src/compiler/crystal/interpreter/context.cr
+++ b/src/compiler/crystal/interpreter/context.cr
@@ -432,7 +432,7 @@ class Crystal::Repl::Context
   # used in `Crystal::Program#each_dll_path`
   private def dll_search_paths
     {% if flag?(:msvc) %}
-      paths = CrystalLibraryPath.paths
+      paths = CrystalLibraryPath.default_paths
 
       if executable_path = Process.executable_path
         paths << File.dirname(executable_path)