diff --git a/tests/vm/files/README.md b/tests/files/README.md similarity index 100% rename from tests/vm/files/README.md rename to tests/files/README.md diff --git a/tests/vm/files/TODO b/tests/files/TODO similarity index 100% rename from tests/vm/files/TODO rename to tests/files/TODO diff --git a/tests/vm/files/blockgenesistest.json b/tests/files/blockgenesistest.json similarity index 100% rename from tests/vm/files/blockgenesistest.json rename to tests/files/blockgenesistest.json diff --git a/tests/vm/files/genesishashestest.json b/tests/files/genesishashestest.json similarity index 100% rename from tests/vm/files/genesishashestest.json rename to tests/files/genesishashestest.json diff --git a/tests/vm/files/hexencodetest.json b/tests/files/hexencodetest.json similarity index 100% rename from tests/vm/files/hexencodetest.json rename to tests/files/hexencodetest.json diff --git a/tests/vm/files/keyaddrtest.json b/tests/files/keyaddrtest.json similarity index 100% rename from tests/vm/files/keyaddrtest.json rename to tests/files/keyaddrtest.json diff --git a/tests/vm/files/namecoin.json b/tests/files/namecoin.json similarity index 100% rename from tests/vm/files/namecoin.json rename to tests/files/namecoin.json diff --git a/tests/vm/files/rlptest.json b/tests/files/rlptest.json similarity index 100% rename from tests/vm/files/rlptest.json rename to tests/files/rlptest.json diff --git a/tests/vm/files/trietest.json b/tests/files/trietest.json similarity index 100% rename from tests/vm/files/trietest.json rename to tests/files/trietest.json diff --git a/tests/vm/files/trietestnextprev.json b/tests/files/trietestnextprev.json similarity index 100% rename from tests/vm/files/trietestnextprev.json rename to tests/files/trietestnextprev.json diff --git a/tests/vm/files/txtest.json b/tests/files/txtest.json similarity index 100% rename from tests/vm/files/txtest.json rename to tests/files/txtest.json diff --git a/tests/vm/files/vmtests/random.json b/tests/files/vmtests/random.json similarity index 100% rename from tests/vm/files/vmtests/random.json rename to tests/files/vmtests/random.json diff --git a/tests/vm/files/vmtests/vmArithmeticTest.json b/tests/files/vmtests/vmArithmeticTest.json similarity index 100% rename from tests/vm/files/vmtests/vmArithmeticTest.json rename to tests/files/vmtests/vmArithmeticTest.json diff --git a/tests/vm/files/vmtests/vmBitwiseLogicOperationTest.json b/tests/files/vmtests/vmBitwiseLogicOperationTest.json similarity index 100% rename from tests/vm/files/vmtests/vmBitwiseLogicOperationTest.json rename to tests/files/vmtests/vmBitwiseLogicOperationTest.json diff --git a/tests/vm/files/vmtests/vmBlockInfoTest.json b/tests/files/vmtests/vmBlockInfoTest.json similarity index 100% rename from tests/vm/files/vmtests/vmBlockInfoTest.json rename to tests/files/vmtests/vmBlockInfoTest.json diff --git a/tests/vm/files/vmtests/vmEnvironmentalInfoTest.json b/tests/files/vmtests/vmEnvironmentalInfoTest.json similarity index 100% rename from tests/vm/files/vmtests/vmEnvironmentalInfoTest.json rename to tests/files/vmtests/vmEnvironmentalInfoTest.json diff --git a/tests/vm/files/vmtests/vmIOandFlowOperationsTest.json b/tests/files/vmtests/vmIOandFlowOperationsTest.json similarity index 100% rename from tests/vm/files/vmtests/vmIOandFlowOperationsTest.json rename to tests/files/vmtests/vmIOandFlowOperationsTest.json diff --git a/tests/vm/files/vmtests/vmPushDupSwapTest.json b/tests/files/vmtests/vmPushDupSwapTest.json similarity index 100% rename from tests/vm/files/vmtests/vmPushDupSwapTest.json rename to tests/files/vmtests/vmPushDupSwapTest.json diff --git a/tests/vm/files/vmtests/vmSha3Test.json b/tests/files/vmtests/vmSha3Test.json similarity index 100% rename from tests/vm/files/vmtests/vmSha3Test.json rename to tests/files/vmtests/vmSha3Test.json diff --git a/tests/vm/files/vmtests/vmSystemOperationsTest.json b/tests/files/vmtests/vmSystemOperationsTest.json similarity index 100% rename from tests/vm/files/vmtests/vmSystemOperationsTest.json rename to tests/files/vmtests/vmSystemOperationsTest.json diff --git a/tests/vm/files/vmtests/vmtests.json b/tests/files/vmtests/vmtests.json similarity index 100% rename from tests/vm/files/vmtests/vmtests.json rename to tests/files/vmtests/vmtests.json diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index 1e247c3a8..466fae9c7 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -89,46 +89,46 @@ func RunVmTest(p string, t *testing.T) { // 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) { //helper.Logger.SetLogLevel(5) - const fn = "files/vmtests/vmArithmeticTest.json" + const fn = "../files/vmtests/vmArithmeticTest.json" RunVmTest(fn, t) } func TestVMSystemOperation(t *testing.T) { - const fn = "files/vmtests/vmSystemOperationsTest.json" + const fn = "../files/vmtests/vmSystemOperationsTest.json" RunVmTest(fn, t) } func TestBitwiseLogicOperation(t *testing.T) { - const fn = "files/vmtests/vmBitwiseLogicOperationTest.json" + const fn = "../files/vmtests/vmBitwiseLogicOperationTest.json" RunVmTest(fn, t) } func TestBlockInfo(t *testing.T) { - const fn = "files/vmtests/vmBlockInfoTest.json" + const fn = "../files/vmtests/vmBlockInfoTest.json" RunVmTest(fn, t) } func TestEnvironmentalInfo(t *testing.T) { - const fn = "files/vmtests/vmEnvironmentalInfoTest.json" + const fn = "../files/vmtests/vmEnvironmentalInfoTest.json" RunVmTest(fn, t) } func TestFlowOperation(t *testing.T) { - const fn = "files/vmtests/vmIOandFlowOperationsTest.json" + const fn = "../files/vmtests/vmIOandFlowOperationsTest.json" RunVmTest(fn, t) } func TestPushDupSwap(t *testing.T) { - const fn = "files/vmtests/vmPushDupSwapTest.json" + const fn = "../files/vmtests/vmPushDupSwapTest.json" RunVmTest(fn, t) } func TestVMSha3(t *testing.T) { - const fn = "files/vmtests/vmSha3Test.json" + const fn = "../files/vmtests/vmSha3Test.json" RunVmTest(fn, t) } func TestVm(t *testing.T) { - const fn = "files/vmtests/vmtests.json" + const fn = "../files/vmtests/vmtests.json" RunVmTest(fn, t) }