From 74a3a6b096661d21da3d5f9980fbbf935ffb2855 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Date: Mon, 14 May 2012 09:40:08 +0100
Subject: Remove Luxio dependency from test suite

---
 Makefile                    | 2 +-
 test/test-lace.compiler.lua | 3 +--
 test/test-lace.engine.lua   | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index f45d088..2d5fad4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ all: test
 
 TEST_MODULES := lace lace.lex lace.compiler
 
-LUA := LUA_PATH="$(shell pwd)/lib/?.lua;$(shell pwd)/extras/luacov/src/?.lua;$(HOME)/dev-bzr/luxio/?.lua;;" LUA_CPATH="$(HOME)/dev-bzr/luxio/?.so;;" lua5.1
+LUA := LUA_PATH="$(shell pwd)/lib/?.lua;$(shell pwd)/extras/luacov/src/?.lua;;" lua5.1
 
 clean:
 	$(RM) luacov.report.out luacov.stats.out
diff --git a/test/test-lace.compiler.lua b/test/test-lace.compiler.lua
index dabc54e..2de62eb 100644
--- a/test/test-lace.compiler.lua
+++ b/test/test-lace.compiler.lua
@@ -12,7 +12,6 @@
 local luacov = require 'luacov'
 
 local compiler = require 'lace.compiler'
-local sio = require 'luxio.simple'
 
 local testnames = {}
 
@@ -121,7 +120,7 @@ local comp_context = {
 		  if name == "THROW_ERROR" then
 		     error("THROWN")
 		  end
-		  local fh, msg = sio.open("test/test-lace.compile-" .. name .. ".rules", "r")
+		  local fh = io.open("test/test-lace.compile-" .. name .. ".rules", "r")
 		  if not fh then
 		     return compiler.error("LOADER: Unknown: " .. name, {1})
 		  end
diff --git a/test/test-lace.engine.lua b/test/test-lace.engine.lua
index 18c21a0..750bf06 100644
--- a/test/test-lace.engine.lua
+++ b/test/test-lace.engine.lua
@@ -13,8 +13,6 @@ local luacov = require 'luacov'
 
 local lace = require 'lace'
 
-local sio = require 'luxio.simple'
-
 local testnames = {}
 
 local function add_test(suite, name, value)
@@ -109,7 +107,7 @@ local comp_context = {
 		  if name == "THROW_ERROR" then
 		     error("THROWN")
 		  end
-		  local fh, msg = sio.open("test/test-lace.engine-" .. name .. ".rules", "r")
+		  local fh = io.open("test/test-lace.engine-" .. name .. ".rules", "r")
 		  if not fh then
 		     return compiler.error("LOADER: Unknown: " .. name, {1})
 		  end
-- 
cgit v1.2.1