Changeset 321 for trunk/tests/lualib_test

Timestamp:

08/25/14 02:43:30 (11 years ago)

Author:

epyon

Message:

• updated all tests to new nova
• cleaned up tests paths
• general cleanup of tests and test data

Location:

trunk/tests/lualib_test

Files:

• lualib_test.lua (added)
• nv_lualib_test.cc (moved) (moved from trunk/tests/lualib_test/lualib_test.cc) (2 diffs)
• premake4.lua (modified) (1 diff)
• rl.lua (deleted)

trunk/tests/lualib_test/nv_lualib_test.cc

@@ -4 +4 @@
 #include <nv/lua/lua_raw.hh>
 #include <nv/lua/lua_glm.hh>
-#include <nv/logger.hh>
-#include <nv/math.hh>
-#include <nv/object.hh>
-#include <string>
+#include <nv/core/logger.hh>
+#include <nv/core/math.hh>
+#include <nv/core/string.hh>
 #include <iostream>
 #include <functional>
-#include <nv/gui/gui_element.hh>
 
 void hello( const std::string& h )
@@ -31 +29 @@
                 nv::lua::register_glm( state );
                 // run the Lua script
-                state.register_function<decltype(hello),&hello>( "hello" );
+                state.register_function<decltype(&hello),&hello>( "hello" );
                 state.do_file( "init.lua" );
                 //std::cout << nv::function_traits<decltype(hello)>::arg_count << std::endl;

trunk/tests/lualib_test/premake4.lua

@@ -8 +8 @@
                 defines { "DEBUG" }
                 flags { "Symbols", "StaticRuntime" }
-                objdir (_ACTION.."/debug")
+                objdir ("../../".._ACTION.."/debug")
 
         configuration "release"
                 defines { "NDEBUG" }
                 flags { "Optimize", "StaticRuntime" }
-                objdir (_ACTION.."/release")
+                objdir ("../../".._ACTION.."/release")
 
         dofile("lualib_test.lua")
         dofile("../../nv.lua")
-
-if _ACTION == "clean" then
-        for action in premake.action.each() do
-                os.rmdir(action.trigger)
-        end
-end