From e82100367f794856a8807b5fcfe9f0043902a294 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Wed, 10 Jun 2015 12:34:38 -0400
Subject: Fix paths

---
 tests/vm_test.go | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'tests/vm_test.go')

diff --git a/tests/vm_test.go b/tests/vm_test.go
index b42f83df8..faa3205bc 100644
--- a/tests/vm_test.go
+++ b/tests/vm_test.go
@@ -1,77 +1,80 @@
 package tests
 
 import (
+	"path/filepath"
 	"testing"
 )
 
+var vmTestDir = filepath.Join(baseDir, "VMTests")
+
 // I've created a new function for each tests so it's easier to identify where the problem lies if any of them fail.
 func TestVMArithmetic(t *testing.T) {
-	const fn = "../files/VMTests/vmArithmeticTest.json"
+	fn := filepath.Join(vmTestDir, "vmArithmeticTest.json")
 	RunVmTest(fn, t)
 }
 
 func TestBitwiseLogicOperation(t *testing.T) {
-	const fn = "../files/VMTests/vmBitwiseLogicOperationTest.json"
+	fn := filepath.Join(vmTestDir, "vmBitwiseLogicOperationTest.json")
 	RunVmTest(fn, t)
 }
 
 func TestBlockInfo(t *testing.T) {
-	const fn = "../files/VMTests/vmBlockInfoTest.json"
+	fn := filepath.Join(vmTestDir, "vmBlockInfoTest.json")
 	RunVmTest(fn, t)
 }
 
 func TestEnvironmentalInfo(t *testing.T) {
-	const fn = "../files/VMTests/vmEnvironmentalInfoTest.json"
+	fn := filepath.Join(vmTestDir, "vmEnvironmentalInfoTest.json")
 	RunVmTest(fn, t)
 }
 
 func TestFlowOperation(t *testing.T) {
-	const fn = "../files/VMTests/vmIOandFlowOperationsTest.json"
+	fn := filepath.Join(vmTestDir, "vmIOandFlowOperationsTest.json")
 	RunVmTest(fn, t)
 }
 
 func TestLogTest(t *testing.T) {
-	const fn = "../files/VMTests/vmLogTest.json"
+	fn := filepath.Join(vmTestDir, "vmLogTest.json")
 	RunVmTest(fn, t)
 }
 
 func TestPerformance(t *testing.T) {
-	const fn = "../files/VMTests/vmPerformanceTest.json"
+	fn := filepath.Join(vmTestDir, "vmPerformanceTest.json")
 	RunVmTest(fn, t)
 }
 
 func TestPushDupSwap(t *testing.T) {
-	const fn = "../files/VMTests/vmPushDupSwapTest.json"
+	fn := filepath.Join(vmTestDir, "vmPushDupSwapTest.json")
 	RunVmTest(fn, t)
 }
 
 func TestVMSha3(t *testing.T) {
-	const fn = "../files/VMTests/vmSha3Test.json"
+	fn := filepath.Join(vmTestDir, "vmSha3Test.json")
 	RunVmTest(fn, t)
 }
 
 func TestVm(t *testing.T) {
-	const fn = "../files/VMTests/vmtests.json"
+	fn := filepath.Join(vmTestDir, "vmtests.json")
 	RunVmTest(fn, t)
 }
 
 func TestVmLog(t *testing.T) {
-	const fn = "../files/VMTests/vmLogTest.json"
+	fn := filepath.Join(vmTestDir, "vmLogTest.json")
 	RunVmTest(fn, t)
 }
 
 func TestInputLimits(t *testing.T) {
-	const fn = "../files/VMTests/vmInputLimits.json"
+	fn := filepath.Join(vmTestDir, "vmInputLimits.json")
 	RunVmTest(fn, t)
 }
 
 func TestInputLimitsLight(t *testing.T) {
-	const fn = "../files/VMTests/vmInputLimitsLight.json"
+	fn := filepath.Join(vmTestDir, "vmInputLimitsLight.json")
 	RunVmTest(fn, t)
 }
 
 func TestVMRandom(t *testing.T) {
-	fns, _ := filepath.Glob("../files/VMTests/RandomTests/*")
+	fns, _ := filepath.Glob(filepath.Join(baseDir, "RandomTests", "*"))
 	for _, fn := range fns {
 		RunVmTest(fn, t)
 	}
-- 
cgit v1.2.3