Patrick J Cherry
191b3bc72c
Merge branch 'master' of gitlab.bytemark.co.uk:open-source/flexnbd-c into fix-check-readwrite
2016-10-06 14:06:21 +01:00
James Carter
770ca0d0e5
Merge branch 'fix-test-names' into 'master'
...
Fixed up internal test names (copy/pasta?)
The test names output by `make check` now reflect reality.
See merge request !16
2016-10-06 14:04:54 +01:00
Patrick J Cherry
6505588f25
Fixed check_readwrite test to pass correct handle to fd_write_reply
...
The (char*) cast to resp->received.handle.b was causing a segfault
2016-10-06 14:01:47 +01:00
Patrick J Cherry
957707bcfc
Fixed up internal test names (copy/pasta?)
...
The test names output by `make check` now reflect reality.
2016-10-06 13:44:20 +01:00
James Carter
3f01b77221
Merge branch 'update-manpages-again' into 'master'
...
Updated manpages, replaces a2x with txt2man
This simplifies the build-deps for Debian packages a little, and brings
the docs up to date.
See merge request !15
2016-10-06 13:43:53 +01:00
Patrick J Cherry
0dbea7f8fe
Removed extra tabs
...
Oops
2016-10-06 13:11:07 +01:00
Patrick J Cherry
091aacd16d
Updated manpages, replaces a2x with txt2man
...
This simplifies the build-deps for Debian packages a little, and brings
the docs up to date.
2016-10-06 12:55:05 +01:00
Patrick J Cherry
04b6637451
Merge branch 'failed-tests-cause-error' into 'master'
...
failures in make check now result in an error
See merge request !13
2016-10-05 17:20:43 +01:00
James F. Carter
7d2eda6cea
failures in make check now result in an error
2016-10-05 16:28:27 +01:00
Patrick J Cherry
7e152ca4f2
Merge branch '24-tests-in-gitlab' into 'master'
...
Resolve "tests should be run in gitlab-ci"
Closes #24
See merge request !12
2016-10-05 15:08:22 +01:00
James F. Carter
fe0125efbc
Merge branch 'master' into 24-tests-in-gitlab
2016-10-05 14:27:56 +01:00
James Carter
ebaaa6d671
Merge branch '25-retire-rake' into 'master'
...
Moved tasks from Rake to Make
The rake file was obsolete, apart from one invocation of ruby in a shell!
Closes #25
See merge request !11
2016-10-05 14:26:06 +01:00
James F. Carter
8cc8588744
Merge branch '24-tests-in-gitlab' of gitlab.bytemark.co.uk:open-source/flexnbd-c into 24-tests-in-gitlab
2016-10-05 13:06:36 +01:00
James F. Carter
5da77ea39a
remove unnecessary step in gitlab-ci
2016-10-05 12:52:32 +01:00
James F. Carter
a744965c67
add missing deps on server object files when building check binaries
2016-10-05 12:51:58 +01:00
Patrick J Cherry
d07659f694
Merge branch '24-tests-in-gitlab' of gitlab.bytemark.co.uk:open-source/flexnbd-c into 25-retire-rake
2016-10-05 12:49:53 +01:00
Patrick J Cherry
30562ed900
Added dpkg-dev to requirements
...
Allows dpkg-architecture to run.
2016-10-05 12:49:25 +01:00
Patrick J Cherry
93c0fa2e92
Merged in gitlab-ci.yml and fixed to use Make
...
The CI should now use Make instead of Rake
2016-10-05 12:47:24 +01:00
Patrick J Cherry
8dc491fb89
Merge branch '24-tests-in-gitlab' of gitlab.bytemark.co.uk:open-source/flexnbd-c into 25-retire-rake
2016-10-05 12:46:47 +01:00
Patrick J Cherry
ea7cd64fc2
Moved tasks from Rake to Make
...
The rake file was obsolete, apart from one invocation of ruby in a
shell!
2016-10-05 12:36:06 +01:00
James F. Carter
35d3340708
avoid need for slow-to-install asciidoc in gitlab-ci
2016-10-05 12:10:21 +01:00
James F. Carter
d47a44a204
install asciidoc in gitlab-ci
2016-10-05 12:07:24 +01:00
James F. Carter
d6968d8242
explicitly compile before running tests in gitlab-ci
2016-10-05 12:06:11 +01:00
James F. Carter
bf85e329a0
clean build environment before running tests in gitlab-ci
2016-10-05 12:03:23 +01:00
James F. Carter
edcaef532c
revert gitlab-ci to ruby2.1
2016-10-05 11:58:50 +01:00
James F. Carter
cb920e4e9d
Merge branch 'master' into 24-tests-in-gitlab
2016-10-05 11:58:21 +01:00
Patrick J Cherry
91d85633b6
Merge branch 'force-encoding-for-ruby21' into 'master'
...
force binary encoding in a ruby2.1-compatible way
See merge request !10
2016-10-05 11:57:14 +01:00
James Carter
7c516b85a6
Merge branch 'makefile-fixes' into 'master'
...
Makefile fixes
See merge request !2
2016-10-05 11:55:54 +01:00
James F. Carter
679fa6dbf8
force binary encoding in a ruby2.1-compatible way
2016-10-05 11:54:09 +01:00
James F. Carter
50708326ec
try ruby2.3 in gitlab-ci
2016-10-05 11:42:32 +01:00
James F. Carter
d907025d71
try a newer version of ruby in gitlab-ci
2016-10-05 11:39:56 +01:00
James F. Carter
e4d398a078
install net-tools in gitlab-ci
2016-10-05 11:29:42 +01:00
James F. Carter
8de0780125
install libev-dev in gitlab-ci
2016-10-05 11:26:46 +01:00
James F. Carter
0fd16822ea
run tests in gitlab-ci
2016-10-05 11:12:39 +01:00
Patrick J Cherry
1e3c61b541
Merge branch '23-fix-unit-tests' into 'master'
...
update tests to reflect changes in handle storage
Closes #23
See merge request !9
2016-10-05 11:08:21 +01:00
James F. Carter
a09e14b2d4
whitespace fix
2016-10-05 11:06:39 +01:00
James F. Carter
a6710b6c32
update tests to reflect changes in handle storage
2016-10-05 10:57:52 +01:00
Patrick J Cherry
ed3995303f
Reinstate doc to all
2016-10-05 10:41:23 +01:00
James Carter
f5de8fb12b
Merge branch '20-fix-encoding-failures' into 'master'
...
Use a BINARY encoded string when doing read/write comparisons.
This is a bit of a cheat really, but `#read` returns an ASCII encoded
string, where as our ruby generates UTF-8 encoded strings, causing
assertion failures.
Closes #20
See merge request !8
2016-10-05 10:32:05 +01:00
James F. Carter
99a5f79a52
fixed typo
2016-10-05 10:30:44 +01:00
Patrick J Cherry
356e1fd6a1
Use a BINARY encoded string when doing read/write comparisons.
...
This is a bit of a cheat really, but `#read` returns an ASCII encoded
string, where as our ruby generates UTF-8 encoded strings, causing
assertion failures.
Fixes #20
2016-10-05 10:01:15 +01:00
James Carter
67dcea207d
Merge branch '19-fix-double-definition-warnings' into 'master'
...
Fixes "double-definition of constants" warning
Looks like `#constants.include?` doesn't work as well as `#const_defined?`.
Closes #19
See merge request !6
2016-10-05 10:00:50 +01:00
Patrick J Cherry
d3762162db
Fixes "double-definition of constants" warning
...
Looks like `#constants.include?` doesn't work as well as
`#const_defined?`.
2016-10-05 09:29:07 +01:00
Patrick J Cherry
3571d3f82e
Added net-tools to the build-deps for testing
...
Fixes #21
2016-10-05 09:27:10 +01:00
Patrick J Cherry
4cd7e764bb
Updated changelog
2016-10-04 21:22:07 +01:00
Patrick J Cherry
4f535fbb02
Merge branch 'master' of gitlab.bytemark.co.uk:open-source/flexnbd-c into debian
2016-10-04 21:14:26 +01:00
James Carter
218c55fb63
Merge branch 'simplify-nbd-handles-part-deux' into 'master'
...
Simplified NBD handle comparisons
8 bytes, therefore a uing64_t to compare to, no need for memcmp()
Signed-off-by: Michel Pollet <buserror@gmail.com >
See merge request !5
2016-10-04 15:49:07 +01:00
Michel Pollet
956a602475
Simplified NBD handle comparisons
...
8 bytes, therefore a uing64_t to compare to, no need for memcmp()
Signed-off-by: Michel Pollet <buserror@gmail.com >
2016-10-04 15:41:48 +01:00
James Carter
26a0a82f9d
Merge branch '12-fix-bind' into 'master'
...
Attempt at fixing bind() bug
This will prevent the bind() wrapper to loop forever in some cases. I
could nor reproduce the issue, but this removes the only infinite loop I
could find.
Closes #12
See merge request !3
2016-10-04 15:41:37 +01:00
Michel Pollet
76e0476113
Attempt at fixing bind() bug
...
This will prevent the bind() wrapper to loop forever in some cases. I
could nor reproduc the issue, but this removes the only infinite loop I
could find.
Signed-off-by: Michel Pollet <buserror@gmail.com >
2016-10-04 15:36:46 +01:00
