diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2015-06-03 14:52:46 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2015-06-03 14:52:46 -0700 |
| commit | e5bcdc2a3fdc0c38bf09a596efd951d5aaab1148 (patch) | |
| tree | 3cbc06765d77bba866efc7623c044491b48f31af /tests/bindings/lua | |
| parent | 6f30032183ccd20d7a7f031ebc9350f54179bba8 (diff) | |
| parent | 97eeb570225bb2f1060f4eff18ba664e129767d2 (diff) | |
Merge branch 'master' into google-internal
Diffstat (limited to 'tests/bindings/lua')
| -rw-r--r-- | tests/bindings/lua/test_upb.pb.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/bindings/lua/test_upb.pb.lua b/tests/bindings/lua/test_upb.pb.lua index 02b443a..7c1c0d0 100644 --- a/tests/bindings/lua/test_upb.pb.lua +++ b/tests/bindings/lua/test_upb.pb.lua @@ -1,6 +1,8 @@ -local upb = require "upb" +-- Require "pb" first to ensure that the transitive require of "upb" is +-- handled properly by the "pb" module. local pb = require "upb.pb" +local upb = require "upb" local lunit = require "lunit" if _VERSION >= 'Lua 5.2' then |