Fix more issues

kunitoki · Sep 27, 2024 · c3d96b6 · c3d96b6
1 parent 1c34733
commit c3d96b6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Tests/Source/ClassExtensibleTests.cpp b/Tests/Source/ClassExtensibleTests.cpp
@@ -778,7 +778,7 @@ TEST_F(ClassExtensibleTests, MetatableSecurity)
     }
 }
 
-#if ! LUABRIDGE_TEST_LUAU && LUABRIDGE_TEST_LUA_VERSION >= 502
+#if ! LUABRIDGE_ON_LUAU && LUA_VERSION_NUM >= 502
 TEST_F(ClassExtensibleTests, MetatablePrinting)
 {
     luabridge::getGlobalNamespace(L)

diff --git a/Tests/Source/CoroutineTests.cpp b/Tests/Source/CoroutineTests.cpp
@@ -7,9 +7,9 @@
 namespace {
 int lua_resume_x(lua_State* L, int nargs)
 {
-#if LUABRIDGE_TEST_LUAJIT || LUA_VERSION_NUM == 501
+#if LUABRIDGE_ON_LUAJIT || LUA_VERSION_NUM == 501
     return lua_resume(L, nargs);
-#elif LUABRIDGE_TEST_LUAU || LUABRIDGE_TEST_RAVI || LUA_VERSION_NUM < 504
+#elif LUABRIDGE_ON_LUAU || LUABRIDGE_ON_RAVI || LUA_VERSION_NUM < 504
     return lua_resume(L, nullptr, nargs);
 #else
     [[maybe_unused]] int nresults = 0;
@@ -163,7 +163,7 @@ TEST_F(CoroutineTests, ThreadedRegistration)
     auto env = luaL_ref(thread1, LUA_REGISTRYINDEX);
     lua_rawgeti(thread1, LUA_REGISTRYINDEX, env);
 
-#if LUABRIDGE_TEST_LUAU || LUABRIDGE_TEST_LUAJIT || LUABRIDGE_TEST_LUA_VERSION == 501
+#if LUABRIDGE_ON_LUAU || LUABRIDGE_ON_LUAJIT || LUA_VERSION_NUM == 501
     lua_setfenv(thread1, 1);
 #else
     auto upvalue = lua_setupvalue(thread1, -2, 1);

diff --git a/Tests/Source/LuaRefTests.cpp b/Tests/Source/LuaRefTests.cpp
@@ -337,7 +337,7 @@ TEST_F(LuaRefTests, Comparison)
     EXPECT_TRUE(t2 == t2);
     EXPECT_FALSE(t2 == t3);
 
-#if LUABRIDGE_TEST_LUA_VERSION >= 503 && !LUABRIDGE_ON_LUAU && !LUABRIDGE_ON_LUAJIT
+#if LUA_VERSION_NUM >= 503 && !LUABRIDGE_ON_LUAU && !LUABRIDGE_ON_LUAJIT
     // This has changed in lua 5.3 and is quite a behaviour change
     EXPECT_TRUE(t2 == t4);
 #else

diff --git a/Tests/Source/Tests.cpp b/Tests/Source/Tests.cpp
@@ -769,7 +769,7 @@ TEST_F(LuaBridgeTest, StdSharedPtrDerivedPolymorphic)
 #endif
     }
 
-#if LUABRIDGE_ON_RAVI
+#if LUABRIDGE_ON_RAVI || LUABRIDGE_ON_LUAJIT
     return; // TODO - Ravi asserts on the lua state being invalid because of the previous exception
 #endif