Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
picodata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
picodata
Commits
128d784f
Verified
Commit
128d784f
authored
2 years ago
by
Denis Smirnov
Browse files
Options
Downloads
Patches
Plain Diff
fix: sbroad-cartidge Makefile error in integration tests
parent
e2afc5a3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1414
sbroad import
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+3
-3
3 additions, 3 deletions
Makefile
sbroad-cartridge/Makefile
+7
-3
7 additions, 3 deletions
sbroad-cartridge/Makefile
with
10 additions
and
6 deletions
Makefile
+
3
−
3
View file @
128d784f
include
sbroad-cartridge/Makefile
all
:
build
IMAGE_NAME
=
docker-public.binary.picodata.io/sbroad-builder:0.6.0
ROOT
=
sbroad-cartridge
bench
:
make clean
...
...
@@ -36,9 +39,6 @@ lint:
test
:
cargo
test
--features
mock
-vv
test_integration
:
cd
sbroad-cartridge
&&
$(
MAKE
)
test_integration
test_all
:
test bench_check test_integration
update_ci_image
:
...
...
This diff is collapsed.
Click to expand it.
sbroad-cartridge/Makefile
+
7
−
3
View file @
128d784f
...
...
@@ -9,14 +9,17 @@ else
endif
endif
ROOT
?=
.
TEST_APP
=
$(
ROOT
)
/test_app
build
:
cargo build
--release
build_integration
:
cd
test_app
&&
cartridge build
cartridge build
$(
TEST_APP
)
run_integration
:
cd
test_app
&&
rm
-rf
tmp/tarantool.log
&&
TARANTOOL_LOG_LEVEL
=
7
TARANTOOL_LOG
=
tmp/tarantool.log ./.rocks/bin/luatest
--coverage
-v
test
/
cd
$(
TEST_APP
)
&&
rm
-rf
tmp/tarantool.log
&&
TARANTOOL_LOG_LEVEL
=
7
TARANTOOL_LOG
=
tmp/tarantool.log ./.rocks/bin/luatest
--coverage
-v
test
/
&&
cd
..
install_release
:
mkdir
-p
$(
LUADIR
)
/
$(
PROJECT_NAME
)
...
...
@@ -24,4 +27,5 @@ install_release:
cp
-Rf
src/
*
.lua
$(
LUADIR
)
/
$(
PROJECT_NAME
)
cp
-Rf
cartridge
$(
LUADIR
)
test_integration
:
build_integration run_integration
test_integration
:
$(
MAKE
)
build_integration
&&
$(
MAKE
)
run_integration
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment