Merge branch 'develop' into test-to-require-libs-with-decimal

rvirding · Aug 10, 2019 · a347f57 · a347f57
2 parents 57b178f + 28e0d74
commit a347f57
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,5 @@
+language: erlang
+otp_release:
+  - 20.3
+  - 21.3
+  - 22.0
diff --git a/Makefile b/Makefile
@@ -66,5 +66,9 @@ debug:
 
 .PHONY: all examples clean
 
+.PHONY: test
+test:
+	rebar3 do eunit, ct --cover, cover
+
 # this protects the intermediate .erl files from make's auto deletion
 #.SECONDARY: $(XRL_INTERM) $(YRL_INTERM)
diff --git a/test/luerl_return_SUITE.erl b/test/luerl_return_SUITE.erl
@@ -17,7 +17,7 @@
 -include_lib("common_test/include/ct.hrl").
 
 -export([all/0, groups/0, init_per_suite/1, end_per_suite/1]).
--export([simple_return/1, fun_return/1, use_lib/1]).
+-export([simple_return/1, fun_return/1, use_lib/1, table_tests/1]).
 
 init_per_suite(Config) ->
   DataDir = ?config(data_dir, Config),
@@ -34,7 +34,7 @@ all() ->
 
 groups() ->
   [
-    {return, [parallel], [simple_return, fun_return, use_lib]}
+    {return, [parallel], [simple_return, fun_return, use_lib, table_tests]}
   ].
 
 simple_return(Config) ->
@@ -52,6 +52,9 @@ use_lib(Config) ->
   Expected = [LuaDecimal(B, E) || {B, E} <- [{13, 1}, {7, 1}, {3, 3}]],
   run_and_check(Config, "decimal_test.lua", Expected).
 
+table_tests(Config) ->
+  run_and_check(Config, "table_indexed_table.lua", [111, 222, 333]).
+
 run_tests(Config, Tests) ->
   [run_and_check(Config, Script, Expected) || {Script, Expected} <- Tests].
 

diff --git a/test/luerl_return_SUITE_data/table_indexed_table.lua b/test/luerl_return_SUITE_data/table_indexed_table.lua
@@ -0,0 +1,9 @@
+tk1 = { a = 1 }
+tk2 = { b = 2 }
+
+t = {}
+t[tk1] = 111
+t[tk2] = 222
+t[t] = 333
+
+return t[tk1], t[tk2], t[t]