Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
79ae0969
Commit
79ae0969
authored
Mar 02, 2023
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wip
parent
c909541d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+5
-1
software/erp5/test/test/benchmarks.py
software/erp5/test/test/benchmarks.py
+1
-1
software/erp5/test/test/test_erp5.py
software/erp5/test/test/test_erp5.py
+2
-1
No files found.
component/mariadb/buildout.cfg
View file @
79ae0969
...
@@ -72,8 +72,10 @@ configure-options =
...
@@ -72,8 +72,10 @@ configure-options =
# for RocksDB - see
# for RocksDB - see
# https://lore.kernel.org/linux-btrfs/ed3642c2-682e-08a1-f18d-2d63409b7631@nexedi.com/T/
# https://lore.kernel.org/linux-btrfs/ed3642c2-682e-08a1-f18d-2d63409b7631@nexedi.com/T/
-DWITH_FALLOCATE=NO
-DWITH_FALLOCATE=NO
# -DCMAKE_BUILD_TYPE=Debug
-DDBUG_ASSERT_AS_PRINTF=ON
##
##
CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
-Wno-error=maybe-uninitialized
CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib
CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib
environment =
environment =
CMAKE_PROGRAM_PATH=${cmake:location}/bin
CMAKE_PROGRAM_PATH=${cmake:location}/bin
...
@@ -113,6 +115,7 @@ pre-configure =
...
@@ -113,6 +115,7 @@ pre-configure =
mv include/private sql
mv include/private sql
mkdir -p ${:plugin-dir}
mkdir -p ${:plugin-dir}
configure-options =
configure-options =
# --with-debug
--with-mysql-source=fake_mariadb_source
--with-mysql-source=fake_mariadb_source
--with-mysql-config=${mariadb:location}/bin/mysql_config
--with-mysql-config=${mariadb:location}/bin/mysql_config
--disable-static
--disable-static
...
@@ -125,6 +128,7 @@ make-targets = plugindir=${:plugin-dir} install
...
@@ -125,6 +128,7 @@ make-targets = plugindir=${:plugin-dir} install
patch-options = -p1
patch-options = -p1
patches =
patches =
${:_profile_base_location_}/mroonga_boolean.patch#c818568fe35ca6a4298f18e575d962a0
${:_profile_base_location_}/mroonga_boolean.patch#c818568fe35ca6a4298f18e575d962a0
/srv/slapgrid/slappart15/srv/project/mroonga/hack.diff#bccc5c68ca5e3bfea0b391c46fc5217a
environment =
environment =
PATH=${binutils:location}/bin:${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PATH=${binutils:location}/bin:${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
...
...
software/erp5/test/test/benchmarks.py
View file @
79ae0969
...
@@ -228,4 +228,4 @@ class TestOrderBuildPackingListSimulation(
...
@@ -228,4 +228,4 @@ class TestOrderBuildPackingListSimulation(
(
pt_query_digest
,
mariadb_slowquery_log
),
text
=
True
)
(
pt_query_digest
,
mariadb_slowquery_log
),
text
=
True
)
})
})
breakpoint
()
#
breakpoint()
software/erp5/test/test/test_erp5.py
View file @
79ae0969
...
@@ -460,7 +460,8 @@ class ZopeSkinsMixin:
...
@@ -460,7 +460,8 @@ class ZopeSkinsMixin:
pass
pass
time
.
sleep
(
5
)
time
.
sleep
(
5
)
else
:
else
:
raise
AssertionError
(
"Timeout waiting for activities"
)
import
pdb
;
pdb
.
set_trace
()
#raise AssertionError("Timeout waiting for activities")
@
classmethod
@
classmethod
def
_getAuthenticatedZopeUrl
(
cls
,
path
,
family_name
=
'default'
):
def
_getAuthenticatedZopeUrl
(
cls
,
path
,
family_name
=
'default'
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment