Merge pull request protocolbuffers#32 from haberman/third_party

Moved lunit to third_party for Google compliance.
TeBoring · Jul 7, 2015 · 6d9a9c7 · 6d9a9c7
2 parents 36962f1 + 016587e
commit 6d9a9c7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -445,7 +445,7 @@ testlua: lua
 	@set -e  # Abort on error.
 	@for test in $(LUATESTS) ; do \
 	  echo LUA $$test; \
-	  LUA_PATH="tests/bindings/lua/lunit/?.lua;upb/bindings/lua/?.lua" \
+	  LUA_PATH="third_party/lunit/?.lua;upb/bindings/lua/?.lua" \
 	    LUA_CPATH=upb/bindings/lua/?.so \
 	    lua $$test; \
 	done

diff --git a/tests/bindings/lua/LICENSE → third_party/lunit/LICENSE b/tests/bindings/lua/LICENSE → third_party/lunit/LICENSE
diff --git a/third_party/lunit/README.google b/third_party/lunit/README.google
@@ -0,0 +1,9 @@
+URL: https://github.com/dcurrie/lunit
+Version: 0.5
+License: MIT
+License File: LICENSE
+Description:
+A unit testing library for Lua.
+
+Local Modifications:
+Extracted the two file we actually need from the distribution.
diff --git a/tests/bindings/lua/lunit/console.lua → third_party/lunit/console.lua b/tests/bindings/lua/lunit/console.lua → third_party/lunit/console.lua
diff --git a/tests/bindings/lua/lunit/lunit.lua → third_party/lunit/lunit.lua b/tests/bindings/lua/lunit/lunit.lua → third_party/lunit/lunit.lua