summaryrefslogtreecommitdiff
path: root/gtest
diff options
context:
space:
mode:
authorpengxuanzheng <[email protected]>2020-08-28 18:44:14 +0800
committerpengxuanzheng <[email protected]>2020-08-28 18:44:14 +0800
commit4121cc7cb0fb7d2d3230e0eaa42637cab96e5c8f (patch)
treef00602da9026d72c24688c6403a5128bc0c99d49 /gtest
parent03b064f1f31853c79c4cde8213ed27a572ef3674 (diff)
修改输入参数tsg为TSG
Diffstat (limited to 'gtest')
-rw-r--r--gtest/CMakeLists.txt1
-rw-r--r--gtest/script/do_expected.lua2
-rw-r--r--gtest/script/end_expected.lua2
-rw-r--r--gtest/script/eof_expected.lua2
-rw-r--r--gtest/script/equal_in_expected.lua2
-rw-r--r--gtest/script/name_expected.lua2
-rw-r--r--gtest/script/return_boolean_normal.lua2
-rw-r--r--gtest/script/return_boolean_normal.luajitbin109 -> 109 bytes
-rw-r--r--gtest/script/return_integer_normal.lua2
-rw-r--r--gtest/script/return_integer_normal.luajitbin109 -> 109 bytes
-rw-r--r--gtest/script/return_string_normal.lua2
-rw-r--r--gtest/script/return_string_normal.luajitbin66 -> 66 bytes
-rw-r--r--gtest/script/right_curly_bracket_expected.lua2
-rw-r--r--gtest/script/right_curves_bracket_expected.lua2
-rw-r--r--gtest/script/then_expected.lua2
-rw-r--r--gtest/script/unexpected_symbol.lua2
16 files changed, 12 insertions, 13 deletions
diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt
index 111f465..a230729 100644
--- a/gtest/CMakeLists.txt
+++ b/gtest/CMakeLists.txt
@@ -7,7 +7,6 @@ link_directories("/root/workspace/tsg_lua_0.99/lib")
link_libraries(tsglua gtest gtest_main pthread)
add_definitions(-g -W -Wall)
-#add_executable(gtest_tsg_lua gtest_tsg_lua_vm_create.cpp gtest_tsg_lua_exec.cpp gtest_tsg_lua_cache_script.cpp gtest_tsg_cache_exec.cpp gtest_tsg_lua_uncache_script.cpp gtest_tsg_destory_lua.cpp)
add_executable(../gtest_tsg_lua ${SRCS})
target_link_libraries(../gtest_tsg_lua tsglua gtest gtest_main pthread)
diff --git a/gtest/script/do_expected.lua b/gtest/script/do_expected.lua
index b6d9afb..e730a74 100644
--- a/gtest/script/do_expected.lua
+++ b/gtest/script/do_expected.lua
@@ -1,3 +1,3 @@
-local str = tsg.data
+local str = TSG.data
for i = 0, 10
return string.len(str), str
diff --git a/gtest/script/end_expected.lua b/gtest/script/end_expected.lua
index fb1dfcb..a886c55 100644
--- a/gtest/script/end_expected.lua
+++ b/gtest/script/end_expected.lua
@@ -1,3 +1,3 @@
-local str = tsg.data
+local str = TSG.data
if str then
return string.len(str), str
diff --git a/gtest/script/eof_expected.lua b/gtest/script/eof_expected.lua
index 580dcab..4f94caf 100644
--- a/gtest/script/eof_expected.lua
+++ b/gtest/script/eof_expected.lua
@@ -1,4 +1,4 @@
-local str = tsg.data
+local str = TSG.data
str = string.format('%s', str)
return string.len(str), str
end
diff --git a/gtest/script/equal_in_expected.lua b/gtest/script/equal_in_expected.lua
index 846dd7c..e1294bd 100644
--- a/gtest/script/equal_in_expected.lua
+++ b/gtest/script/equal_in_expected.lua
@@ -1,4 +1,4 @@
-local str = tsg.data
+local str = TSG.data
for i
return string.len(str), str
end
diff --git a/gtest/script/name_expected.lua b/gtest/script/name_expected.lua
index 0d0bd7a..99a131f 100644
--- a/gtest/script/name_expected.lua
+++ b/gtest/script/name_expected.lua
@@ -1,4 +1,4 @@
-local str = tsg.data
+local str = TSG.data
for do
print(str)
end
diff --git a/gtest/script/return_boolean_normal.lua b/gtest/script/return_boolean_normal.lua
index 5ec3497..fbf1fbf 100644
--- a/gtest/script/return_boolean_normal.lua
+++ b/gtest/script/return_boolean_normal.lua
@@ -1,4 +1,4 @@
-local str = tsg.data
+local str = TSG.data
local s_index, e_index = string.find(str, 'hello')
if s_index then
return 1, true
diff --git a/gtest/script/return_boolean_normal.luajit b/gtest/script/return_boolean_normal.luajit
index d76eab6..9bbbfbb 100644
--- a/gtest/script/return_boolean_normal.luajit
+++ b/gtest/script/return_boolean_normal.luajit
Binary files differ
diff --git a/gtest/script/return_integer_normal.lua b/gtest/script/return_integer_normal.lua
index d3c08a7..ccb38fe 100644
--- a/gtest/script/return_integer_normal.lua
+++ b/gtest/script/return_integer_normal.lua
@@ -1,4 +1,4 @@
-local str = tsg.data
+local str = TSG.data
local s_index, e_index = string.find(str, 'world')
if s_index then
return 8, s_index
diff --git a/gtest/script/return_integer_normal.luajit b/gtest/script/return_integer_normal.luajit
index 6c72798..3abd850 100644
--- a/gtest/script/return_integer_normal.luajit
+++ b/gtest/script/return_integer_normal.luajit
Binary files differ
diff --git a/gtest/script/return_string_normal.lua b/gtest/script/return_string_normal.lua
index 0f1c592..e7e6d7b 100644
--- a/gtest/script/return_string_normal.lua
+++ b/gtest/script/return_string_normal.lua
@@ -1,2 +1,2 @@
-local str = tsg.data
+local str = TSG.data
return string.len(str), str
diff --git a/gtest/script/return_string_normal.luajit b/gtest/script/return_string_normal.luajit
index 27764b3..e32af68 100644
--- a/gtest/script/return_string_normal.luajit
+++ b/gtest/script/return_string_normal.luajit
Binary files differ
diff --git a/gtest/script/right_curly_bracket_expected.lua b/gtest/script/right_curly_bracket_expected.lua
index 194864b..f9b4d4a 100644
--- a/gtest/script/right_curly_bracket_expected.lua
+++ b/gtest/script/right_curly_bracket_expected.lua
@@ -1,4 +1,4 @@
-local str = string.format ('%s', tsg.data)
+local str = string.format ('%s', TSG.data)
local table = {}
setmetatable(table, {__index = _G)
return string.len(str), str
diff --git a/gtest/script/right_curves_bracket_expected.lua b/gtest/script/right_curves_bracket_expected.lua
index b901a50..a79a231 100644
--- a/gtest/script/right_curves_bracket_expected.lua
+++ b/gtest/script/right_curves_bracket_expected.lua
@@ -1,2 +1,2 @@
-local str = string.format('%s', tsg.data
+local str = string.format('%s', TSG.data
return string.len(str), str
diff --git a/gtest/script/then_expected.lua b/gtest/script/then_expected.lua
index 8a94370..890e4ad 100644
--- a/gtest/script/then_expected.lua
+++ b/gtest/script/then_expected.lua
@@ -1,4 +1,4 @@
if not nil
- str = tsg.data
+ str = TSG.data
return string.len(str), str
end
diff --git a/gtest/script/unexpected_symbol.lua b/gtest/script/unexpected_symbol.lua
index a51eb44..02c4edf 100644
--- a/gtest/script/unexpected_symbol.lua
+++ b/gtest/script/unexpected_symbol.lua
@@ -1,3 +1,3 @@
-=*
-local str = string.format('%s', tsg.data)
+local str = string.format('%s', TSG.data)
return string.len(str), str