#
#
# patch "tests/non_workspace_keydir/__driver__.lua"
#  from [e0aeaa6d96ae2ada2dfe5a0738215a77669c5a8e]
#    to [66e1457760560e51d1b86f5927c58e2e80b77d08]
#
============================================================
--- tests/non_workspace_keydir/__driver__.lua	e0aeaa6d96ae2ada2dfe5a0738215a77669c5a8e
+++ tests/non_workspace_keydir/__driver__.lua	66e1457760560e51d1b86f5927c58e2e80b77d08
@@ -24,7 +24,7 @@ else
 if ostype == "Windows" then
 expected_ret = 1
 else
-expected_ret = 15
+expected_ret = -15
 end
 
 srv = bg(pure_mtn("serve", "--confdir="..test.root, "--keydir="..test.root.."/keys"), expected_ret, false, true)
@@ -34,7 +34,7 @@ check(qgrep("beginning service", "stderr
 
 -- this should find a private key in the keys directory under the specified confdir
 
-srv = bg(pure_mtn("serve" ,"--confdir="..test.root), expected_ret, false, true)
+srv = bg(pure_mtn("serve", "--confdir="..test.root), expected_ret, false, true)
 sleep(2)
 srv:finish()
 check(qgrep("beginning service", "stderr"))
@@ -47,6 +47,8 @@ check(qgrep("beginning service", "stderr
 
 -- The expected return value is the same on Unix and Windows
 
+mkdir(test.root.."/empty")
+set_env("HOME", test.root.."/empty")
 srv = bg(pure_mtn("serve"), 1, false, true)
 sleep(2)
 srv:finish()