Skip to content

Update msgpuck to latest version and rework test cmake scripts#97

Merged
Totktonada merged 10 commits intotarantool:masterfrom
bigbes:gh-96-latest-msgpuck
Feb 8, 2019
Merged

Update msgpuck to latest version and rework test cmake scripts#97
Totktonada merged 10 commits intotarantool:masterfrom
bigbes:gh-96-latest-msgpuck

Conversation

@bigbes
Copy link
Copy Markdown
Contributor

@bigbes bigbes commented Jul 3, 2018

'Move around' files in the test folder

purpose of this commmit to separate files needed for auto-tests and
manual tests (probably should be converted to autotests)

  • cmake: use sourcedirs/bindirs(current/root) instead of
    relative paths/project_source_dir variable.
  • cmake: extract common test files to separate 'test_common' library
  • move tarantool-tcp test to cli subfolder and rewrite test wrapper
  • rewrite box.lua with 'new' features (such as 'box.once' and
    'LISTEN' variable)

@alg1973
Copy link
Copy Markdown
Contributor

alg1973 commented Jul 5, 2018

Please, see the travis status

@Totktonada
Copy link
Copy Markdown
Contributor

We also need tarantool/msgpuck@222b71a (see here).

Comment thread test/common/common.c Outdated
Comment thread test/common/common.c Outdated
Comment thread test/cli/tarantool_tcp.c
@Totktonada
Copy link
Copy Markdown
Contributor

Pushed a fix for tarantool-tcp.test.py (as a separate commit).

@Totktonada
Copy link
Copy Markdown
Contributor

Pushed the fix for clang as a separate commit. We should squash it with your msgpuck update commit I think.

The purpose of this commmit is to separate files needed for auto-tests
and manual tests (probably should be converted to autotests).

* cmake: use sourcedirs/bindirs(current/root) instead of relative
  paths/project_source_dir variable,
* cmake: extract common test files to separate 'test_common' library,
* move tarantool-{tcp,poll} tests to cli subfolder and rewrite test
  wrappers,
* rewrite `box.lua` with 'new' features (such as 'box.once' and 'LISTEN'
  variable).
It is needed to catch -fPIC flag to build and link libmsgpuck.a
statically from the submodule to easily build and test the connector.
Dynamic linking under a cmake option is needed too for packaging, but is
not implemented here. See tarantool#107 for more info.

Closes tarantool#96.
Needed for tarantool#107.
@Totktonada Totktonada force-pushed the gh-96-latest-msgpuck branch from e80cf07 to 6c6de89 Compare February 7, 2019 04:36
@Totktonada
Copy link
Copy Markdown
Contributor

Totktonada commented Feb 7, 2019

Rebased on top of the current master and removed the %zd → %lld change. Squashed fixup commits.

@Totktonada
Copy link
Copy Markdown
Contributor

Totktonada commented Feb 7, 2019

TBD: tarantool/msgpuck@e65e343 changes default build type. We need to set CMAKE_BUILD_TYPE to Debug before including msgpack in CMakeLists.txt.

Update: it was fixed.

OUTPUT_NAME is base name according to the documentation and should not
be a full path. CMake 2.8.12.2 removes leading slash from it, so a build
fails with 'No such directory' error. It works with CMake 3.13.3,
however.
`make test` is still broken, but the connector builds.
@Totktonada
Copy link
Copy Markdown
Contributor

@bigbes Can you look into the PR? Now CI is green.

@Totktonada Totktonada merged commit c2889cc into tarantool:master Feb 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants