Revert "package/prosody: use correct bit32 package"
PATCH 1/1 Revert "package/prosody: use correct bit32 package"
This reverts commit fa84c176c2148a60103e850204180f86aa5baa73 that replace luabitop by lua_bit32 package when lua 5.1 is used.
Since this change the prosody test in gitlab is fail due to missing lua-bitops [1]:
Starting prosody:
**************************
Prosody was unable to find lua-bitops
This package can be obtained in the following ways:
Source: http://bitop.luajit.org/ Debian/Ubuntu: sudo apt-get install lua-bitop luarocks: luarocks install luabitop
WebSocket support will not be available
More help can be found on our website, at https://prosody.im/doc/depends
**************************
The upstream documentation [2] is misleading (or not uptodate) about lua-bit32 dependency.
Since bitop is builtin since lua5.2, we probably need to select luabitop package only when lua 5.1 is used as lua interpreter.
Tested with run-tests:
./support/testing/run-tests tests.package.test_prosody.TestProsodyLua51
[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/576271975
[2] https://prosody.im/doc/depends#bitop
--- package/prosody/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/prosody/Config.in +1 -1
@@ -4,7 +4,7 @@ config BR2_PACKAGE_PROSODY depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on !BR2_PACKAGE_LUA_5_3 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 # runtime + select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime
Signature · 1 line
2.25.4
PATCH 1/1 Revert "package/prosody: use correct bit32 package"
Quoted 23 lines · Romain Naour
This reverts commit
fa84c176c2148a60103e850204180f86aa5baa73that replace luabitop bylua_bit32package when lua 5.1 is used.Since this change the prosody test in gitlab is fail due to missing lua-bitops [1]:
Starting prosody:
**************************
Prosody was unable to find lua-bitops
This package can be obtained in the following ways:Source: http://bitop.luajit.org/ Debian/Ubuntu: sudo apt-get install lua-bitop luarocks: luarocks install luabitopWebSocket support will not be available
More help can be found on our website, at https://prosody.im/doc/depends
**************************The upstream documentation [2] is misleading (or not uptodate) about lua-bit32 dependency.
Quoted 7 lines
Since bitop is builtin since lua5.2, we probably need to select luabitop package only when lua 5.1 is used as lua interpreter.
Tested with run-tests:
./support/testing/run-tests tests.package.test_prosody.TestProsodyLua51[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/576271975
Isn't this job failure just due to this faulty test? self.module_test('bit') # luabitop
Which should be replaced with:self.module_test('bit32') # luabit32
or something along those lines?
Quoted 25 lines
[2] https://prosody.im/doc/depends#bitop
Signed-off-by Romain Naour <[email protected]>Cc James Hilliard <[email protected]>Cc Yann E. MORIN <[email protected]>--- package/prosody/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/prosody/Config.in +1
-2@@ -4,7 +4,7 @@ config BR2_PACKAGE_PROSODY depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on !BR2_PACKAGE_LUA_5_3 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 # runtime + select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime --2.25.4
PATCH 1/1 Revert "package/prosody: use correct bit32 package"
Hi James,
Le 04/06/2020 ? 00:30, James Hilliard a ?crit?:
Quoted 30 lines · Romain Naour
Quoted 29 lines
This reverts commit
fa84c176c2148a60103e850204180f86aa5baa73that replace luabitop bylua_bit32package when lua 5.1 is used.Since this change the prosody test in gitlab is fail due to missing lua-bitops [1]:
Starting prosody:
**************************
Prosody was unable to find lua-bitops
This package can be obtained in the following ways:Source: http://bitop.luajit.org/ Debian/Ubuntu: sudo apt-get install lua-bitop luarocks: luarocks install luabitopWebSocket support will not be available
More help can be found on our website, at https://prosody.im/doc/depends
**************************The upstream documentation [2] is misleading (or not uptodate) about lua-bit32 dependency.
Since bitop is builtin since lua5.2, we probably need to select luabitop package only when lua 5.1 is used as lua interpreter.
Tested with run-tests:
./support/testing/run-tests tests.package.test_prosody.TestProsodyLua51
Quoted 6 lines
Quoted 1 line
[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/576271975
Isn't this job failure just due to this faulty test?
self.module_test('bit')# luabitop
Which should be replaced with:self.module_test('bit32')# luabit32
or something along those lines?
I'm not speaking about the test itself but the prosody log when it's started "Prosody was unable to find lua-bitops"
Also the test is shared with luajit and the TestProsodyLuajit test is fine.
Best regards,
Romain
Quoted 25 lines
Quoted 25 lines
[2] https://prosody.im/doc/depends#bitop
Signed-off-by Romain Naour <[email protected]>Cc James Hilliard <[email protected]>Cc Yann E. MORIN <[email protected]>--- package/prosody/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/prosody/Config.in +1
-2@@ -4,7 +4,7 @@ config BR2_PACKAGE_PROSODY depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on !BR2_PACKAGE_LUA_5_3 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 # runtime + select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime --2.25.4
PATCH 1/1 Revert "package/prosody: use correct bit32 package"
Quoted 35 lines · Romain Naour
Hi James,
Le 04/06/2020 ? 00:30, James Hilliard a ?crit :
Quoted 31 lines · Romain Naour
Quoted 30 lines
This reverts commit
fa84c176c2148a60103e850204180f86aa5baa73that replace luabitop bylua_bit32package when lua 5.1 is used.Since this change the prosody test in gitlab is fail due to missing lua-bitops [1]:
Starting prosody:
**************************
Prosody was unable to find lua-bitops
This package can be obtained in the following ways:Source: http://bitop.luajit.org/ Debian/Ubuntu: sudo apt-get install lua-bitop luarocks: luarocks install luabitopWebSocket support will not be available
More help can be found on our website, at https://prosody.im/doc/depends
**************************The upstream documentation [2] is misleading (or not uptodate) about lua-bit32 dependency.
Since bitop is builtin since lua5.2, we probably need to select luabitop package only when lua 5.1 is used as lua interpreter.
Tested with run-tests:
./support/testing/run-tests tests.package.test_prosody.TestProsodyLua51[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/576271975
Quoted 8 lines
Quoted 5 lines
Isn't this job failure just due to this faulty test?
self.module_test('bit')# luabitop
Which should be replaced with:self.module_test('bit32')# luabit32
or something along those lines?I'm not speaking about the test itself but the prosody log when it's started "Prosody was unable to find lua-bitops"
Oh, might need to backport https://hg.prosody.im/trunk/rev/48f7cda4174d
git version:
https://github.com/bjc/prosody/commit/aedca363c093007542941749578caf1badf1674e
Quoted 32 lines
Also the test is shared with luajit and the TestProsodyLuajit test is fine.
Best regards,
RomainQuoted 25 lines
Quoted 25 lines
[2] https://prosody.im/doc/depends#bitop
Signed-off-by Romain Naour <[email protected]>Cc James Hilliard <[email protected]>Cc Yann E. MORIN <[email protected]>--- package/prosody/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/prosody/Config.in +1
-2@@ -4,7 +4,7 @@ config BR2_PACKAGE_PROSODY depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on !BR2_PACKAGE_LUA_5_3 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 # runtime + select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime --2.25.4
PATCH 1/1 Revert "package/prosody: use correct bit32 package"
Hi James,
Le 04/06/2020 ? 02:18, James Hilliard a ?crit?:
Quoted 42 lines · Romain Naour
Quoted 41 lines
Hi James,
Le 04/06/2020 ? 00:30, James Hilliard a ?crit :
Quoted 36 lines · Romain Naour
Quoted 23 lines
This reverts commit
fa84c176c2148a60103e850204180f86aa5baa73that replace luabitop bylua_bit32package when lua 5.1 is used.Since this change the prosody test in gitlab is fail due to missing lua-bitops [1]:
Starting prosody:
**************************
Prosody was unable to find lua-bitops
This package can be obtained in the following ways:Source: http://bitop.luajit.org/ Debian/Ubuntu: sudo apt-get install lua-bitop luarocks: luarocks install luabitopWebSocket support will not be available
More help can be found on our website, at https://prosody.im/doc/depends
**************************The upstream documentation [2] is misleading (or not uptodate) about lua-bit32 dependency.
Quoted 7 lines
Since bitop is builtin since lua5.2, we probably need to select luabitop package only when lua 5.1 is used as lua interpreter.
Tested with run-tests:
./support/testing/run-tests tests.package.test_prosody.TestProsodyLua51[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/576271975
Isn't this job failure just due to this faulty test?
self.module_test('bit')# luabitop
Which should be replaced with:self.module_test('bit32')# luabit32
or something along those lines?
Quoted 5 lines
Quoted 2 lines
I'm not speaking about the test itself but the prosody log when it's started "Prosody was unable to find lua-bitops"
Oh, might need to backport https://hg.prosody.im/trunk/rev/48f7cda4174d
git version:
https://github.com/bjc/prosody/commit/aedca363c093007542941749578caf1badf1674e
Prosody 0.11.5 really test LUABITOP dependency [1] but indeed the upstream commit you suggest introduce a compatibility layer for bitwise operations.
The compat layer allow to use bit32 instead of bit module:
Lua 5.3 bit32 (with compat enabled) Lua 5.2 bit32 (built-in) Lua 5.1 bit32 (standalone module LUA_BIT32)
Lua 5.3 util.bit53
Lua 5.4 util.bit53
LuaJIT bit (bitop library) Lua 5.1 bit (luabitop)
It seems your change should be done with the next version of prosody and the Buildroot test updated to check bit32 module instead of bit module. But for now luatop should be used and the current lua tests in prosody.py are ok.
[1] https://github.com/bjc/prosody/blob/0.11.5/util/dependencies.lua#L93
Best regards,
Romain
Quoted 32 lines
Quoted 32 lines
Also the test is shared with luajit and the TestProsodyLuajit test is fine.
Best regards,
RomainQuoted 25 lines
Quoted 25 lines
[2] https://prosody.im/doc/depends#bitop
Signed-off-by Romain Naour <[email protected]>Cc James Hilliard <[email protected]>Cc Yann E. MORIN <[email protected]>--- package/prosody/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/prosody/Config.in +1
-2@@ -4,7 +4,7 @@ config BR2_PACKAGE_PROSODY depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on !BR2_PACKAGE_LUA_5_3 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 # runtime + select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime --2.25.4
PATCH 1/1 Revert "package/prosody: use correct bit32 package"
In reply to Romain Naour1) don't trust documentation, trust tests (by running them)
2) with BR, it's easy to run a test (even locally, before a commit), but it isn't easy to know that a test exists.
In my point of view, the right place of test_prosody.py is in the directory package/prosody, not in support/testing/tests/package, support/testing is the right place only for testing infrastructure.
Fran?ois
Le jeu. 4 juin 2020 ? 00:42, Romain Naour <[email protected]> a ?crit :
Quoted 78 lines
Hi James,
Le 04/06/2020 ? 00:30, James Hilliard a ?crit :
Quoted 1 line
On Wed, Jun 3, 2020 at 3:59 PM Romain Naour <[email protected]>
Quoted 12 lines · wrote:
Quoted 12 lines
This reverts commit
fa84c176c2148a60103e850204180f86aa5baa73that replace luabitop bylua_bit32package when lua 5.1 is used.Since this change the prosody test in gitlab is fail due to missing lua-bitops [1]:
Starting prosody:
**************************
Prosody was unable to find lua-bitops
This package can be obtained in the following ways:Quoted 6 lines
Quoted 6 lines
Source: http://bitop.luajit.org/ Debian/Ubuntu: sudo apt-get install lua-bitop luarocks: luarocks install luabitopWebSocket support will not be available
More help can be found on our website, athttps://prosody.im/doc/depends
Quoted 11 lines
Quoted 11 lines
**************************
The upstream documentation [2] is misleading (or not uptodate) about lua-bit32 dependency.
Since bitop is builtin since lua5.2, we probably need to select luabitop package only when lua 5.1 is used as lua interpreter.
Tested with run-tests:
./support/testing/run-tests tests.package.test_prosody.TestProsodyLua51Quoted 6 lines
Quoted 1 line
[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/576271975
Isn't this job failure just due to this faulty test?
self.module_test('bit')# luabitop
Which should be replaced with:self.module_test('bit32')# luabit32
or something along those lines?I'm not speaking about the test itself but the prosody log when it's started
"Prosody was unable to find lua-bitops"Also the test is shared with luajit and the TestProsodyLuajit test is fine.
Best regards,
RomainQuoted 9 lines
Quoted 9 lines
[2] https://prosody.im/doc/depends#bitop
Signed-off-by Romain Naour <[email protected]>Cc James Hilliard <[email protected]>Cc Yann E. MORIN <[email protected]>--- package/prosody/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 8 lines
package/prosody/Config.in config BR2_PACKAGE_PROSODY · line 6
Quoted 8 lines
package/prosody/Config.in +0
-0@@ -4,7 +4,7 @@ config BR2_PACKAGE_PROSODY depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on !BR2_PACKAGE_LUA_5_3 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket,luafilesystem
Quoted 8 lines
Quoted 8 lines
package/prosody/Config.in +1
-2- select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 # runtime + select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime --2.25.4
Quoted 5 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200604/147c256f/attachment.html>
PATCH 1/1 Revert "package/prosody: use correct bit32 package"
Quoted 5 lines · On Thu, 4 Jun 2020 07:00:47 +0200 Fran?ois Perrad <[email protected]>…
2) with BR, it's easy to run a test (even locally, before a commit), but it isn't easy to know that a test exists.
In my point of view, the right place oftest_prosody.pyis in the directory package/prosody, not in support/testing/tests/package, support/testing is the right place only for testing infrastructure.
We indeed though about putting tests near packages. However, one issue is that not all tests are related to packages: some are related to the core infrastructure, and we wouldn't know where to put those tests. And it would be even more confusing to have some tests in support/testing/ and some tests in package/. So for now, we have simply kept all tests in support/testing/, until someone comes up with a better idea :-)
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 1/1 Revert "package/prosody: use correct bit32 package"
In reply to Romain NaourQuoted 31 lines · On Wed, 3 Jun 2020 23:59:04 +0200 Romain Naour <[email protected]> wrote:
This reverts commit
fa84c176c2148a60103e850204180f86aa5baa73that replace luabitop bylua_bit32package when lua 5.1 is used.Since this change the prosody test in gitlab is fail due to missing lua-bitops [1]:
Starting prosody:
**************************
Prosody was unable to find lua-bitops
This package can be obtained in the following ways:Source: http://bitop.luajit.org/ Debian/Ubuntu: sudo apt-get install lua-bitop luarocks: luarocks install luabitopWebSocket support will not be available
More help can be found on our website, at https://prosody.im/doc/depends
**************************The upstream documentation [2] is misleading (or not uptodate) about lua-bit32 dependency.
Since bitop is builtin since lua5.2, we probably need to select luabitop package only when lua 5.1 is used as lua interpreter.
Tested with run-tests:
./support/testing/run-tests tests.package.test_prosody.TestProsodyLua51[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/576271975
[2] https://prosody.im/doc/depends#bitop
Quoted 6 lines
Signed-off-by Romain Naour <[email protected]>Cc James Hilliard <[email protected]>Cc Yann E. MORIN <[email protected]>--- package/prosody/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 Revert "package/prosody: use correct bit32 package"
In reply to Romain NaourQuoted 30 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
This reverts commit
fa84c176c2148a60103e850204180f86aa5baa73that replace luabitop bylua_bit32package when lua 5.1 is used.Since this change the prosody test in gitlab is fail due to missing lua-bitops [1]:
Starting prosody:
**************************
Prosody was unable to find lua-bitops
This package can be obtained in the following ways:Source: http://bitop.luajit.org/ Debian/Ubuntu: sudo apt-get install lua-bitop luarocks: luarocks install luabitopWebSocket support will not be available
More help can be found on our website, at https://prosody.im/doc/depends
**************************The upstream documentation [2] is misleading (or not uptodate) about lua-bit32 dependency.
Since bitop is builtin since lua5.2, we probably need to select luabitop package only when lua 5.1 is used as lua interpreter.
Tested with run-tests:
./support/testing/run-tests tests.package.test_prosody.TestProsodyLua51
Quoted 6 lines
[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/576271975
[2] https://prosody.im/doc/depends#bitopSigned-off-by Romain Naour <[email protected]>Cc James Hilliard <[email protected]>Cc Yann E. MORIN <[email protected]>
Committed to 2020.02.x and 2020.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard