From e2856df19f8fcf316824312ee9b7412ec96731a7 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Thu, 9 Jan 2020 10:55:56 -0800
Subject: [PATCH] enable testing -d:nimHasLibFFI mode

---
 compiler/evalffi.nim  | 3 ++-
 koch.nim              | 6 +++---
 tests/vm/tevalffi.nim | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/evalffi.nim b/compiler/evalffi.nim
index d53fba8164e70..0ebb06e48ecbf 100644
--- a/compiler/evalffi.nim
+++ b/compiler/evalffi.nim
@@ -27,7 +27,8 @@ var
   gDllCache = initTable[string, LibHandle]()
 
 when defined(windows):
-  var gExeHandle = loadLib(os.getAppFilename())
+  from os import getAppFilename
+  var gExeHandle = loadLib(getAppFilename())
 else:
   var gExeHandle = loadLib()
 
diff --git a/koch.nim b/koch.nim
index a0a7dd903d659..f6b68956e9e4d 100644
--- a/koch.nim
+++ b/koch.nim
@@ -484,9 +484,9 @@ proc runCI(cmd: string) =
   ## build nimble early on to enable remainder to depend on it if needed
   kochExecFold("Build Nimble", "nimble")
 
-  when false:
-    execFold("nimble install -y libffi", "nimble install -y libffi")
-    kochExecFold("boot -d:release -d:nimHasLibFFI", "boot -d:release -d:nimHasLibFFI")
+  ## test -d:nimHasLibFFI
+  execFold("nimble install -y libffi", "nimble install -y libffi")
+  kochExecFold("boot -d:release -d:nimHasLibFFI", "boot -d:release -d:nimHasLibFFI")
 
   if getEnv("NIM_TEST_PACKAGES", "false") == "true":
     execFold("Test selected Nimble packages", "nim c -r testament/testament cat nimble-packages")
diff --git a/tests/vm/tevalffi.nim b/tests/vm/tevalffi.nim
index 963d2a58e4612..ca032bdd72bc2 100644
--- a/tests/vm/tevalffi.nim
+++ b/tests/vm/tevalffi.nim
@@ -18,7 +18,6 @@ foo:102:103:104
 foo:0.03:asdf:103:105
 ret={s1:foobar s2:foobar age:25 pi:3.14}
 '''
-  disabled: "true"
 """
 
 # re-enable for windows once libffi can be installed in koch.nim