open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixes to luajc bytecode generation.

Browse Source
This commit is contained in:
James Roseborough
2012-09-19 03:19:55 +00:00
parent 4bf132c01e
commit 0f70a8e962
10 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/junit/org/luaj/vm2/CompatibiltyTest.java
View File

@@ -76,9 +76,9 @@ public class CompatibiltyTest extends TestSuite {
public static TestSuite suite() {
TestSuite suite = new TestSuite("Compatibility Tests");
suite.addTest( new TestSuite( JseCompatibilityTest.class, "JSE Tests" ) );
suite.addTest( new TestSuite( JmeCompatibilityTest.class, "JME Tests" ) );
suite.addTest( new TestSuite( LuaJCTest.class, "JSE Bytecode Tests" ) );
suite.addTest( new TestSuite( JseCompatibilityTest.class, "JSE Compatibility Tests" ) );
suite.addTest( new TestSuite( JmeCompatibilityTest.class, "JME Compatibility Tests" ) );
suite.addTest( new TestSuite( LuaJCCompatibilityTest.class, "LuaJC Compatibility Tests" ) );
return suite;
}
@@ -100,8 +100,8 @@ public class CompatibiltyTest extends TestSuite {
System.setProperty("JME", "false");
}
}
public static class LuaJCTest extends CompatibiltyTestSuite {
public LuaJCTest() {
public static class LuaJCCompatibilityTest extends CompatibiltyTestSuite {
public LuaJCCompatibilityTest() {
super(ScriptDrivenTest.PlatformType.LUAJIT);
}
protected void setUp() throws Exception {

10
test/junit/org/luaj/vm2/FragmentsTest.java
View File

@@ -545,5 +545,15 @@ public class FragmentsTest extends TestSuite {
" end\n" +
"end\n");
}
public void testUpvalueInDoBlock() {
runFragment( LuaValue.NONE, "do\n"+
" local x = 10\n"+
" function g()\n"+
" return x\n"+
" end\n"+
"end\n"+
"g()\n");
}
}
}

3
test/junit/org/luaj/vm2/ScriptDrivenTest.java
View File

@@ -24,6 +24,7 @@ package org.luaj.vm2;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -121,6 +122,8 @@ public class ScriptDrivenTest extends TestCase implements ResourceFinder {
}
} catch (MalformedURLException e) {
e.printStackTrace();
} catch (FileNotFoundException e) {
// Ignore and return null.
} catch (IOException ioe) {
ioe.printStackTrace();
}