stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'patch' into bleeding (Fixes critical issue)

Browse source
This commit is contained in:
Snaipe 2015-09-19 14:50:31 +02:00
commit 981e63f63b
9 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bumpversion.cfg
View file

@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.0.0
current_version = 2.0.1
commit = False
[bumpversion:file:CMakeLists.txt]

2
CMakeLists.txt
View file

@ -28,7 +28,7 @@ endif ()
# Project setup & environment variables
set(PROJECT_VERSION "2.0.0")
set(PROJECT_VERSION "2.0.1")
set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
set(GettextTranslate_ALL 1)
set(GettextTranslate_GMO_BINARY 1)

6
ChangeLog
View file

@ -1,3 +1,9 @@
2015-09-19 Franklin "Snaipe" Mathieu <franklinmathieu@gmail.com>
* criterion: version 2.0.1
* Fix: Fixed wrong setjmp() usage making tests compiled with optimisations
crash.
2015-09-14 Franklin "Snaipe" Mathieu <franklinmathieu@gmail.com>
* criterion: version 2.0.0

8
README.md
View file

@ -39,10 +39,10 @@ the user would have with other frameworks:
## Downloads
* [Linux (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.0/criterion-v2.0.0-linux-x86_64.tar.bz2)
* [OS X (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.0/criterion-v2.0.0-osx-x86_64.tar.bz2)
* [Windows (MSVC - x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.0/criterion-v2.0.0-windows-msvc-x86_64.tar.bz2)
* [Windows (MinGW - x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.0/criterion-v2.0.0-windows-mingw-x86_64.tar.bz2)
* [Linux (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.1/criterion-v2.0.1-linux-x86_64.tar.bz2)
* [OS X (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.1/criterion-v2.0.1-osx-x86_64.tar.bz2)
* [Windows (MSVC - x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.1/criterion-v2.0.1-windows-msvc-x86_64.tar.bz2)
* [Windows (MinGW - x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.1/criterion-v2.0.1-windows-mingw-x86_64.tar.bz2)
If you have a different platform, you can still [build the library from source](http://criterion.readthedocs.org/en/latest/setup.html#installation)

2
appveyor.yml
View file

@ -1,4 +1,4 @@
version: 2.0.0_b{build}-{branch}
version: 2.0.1_b{build}-{branch}
os: Visual Studio 2015

2
doc/conf.py
View file

@ -39,7 +39,7 @@ copyright = u'2015, Franklin "Snaipe" Mathieu'
# built documents.
#
# The short X.Y version.
version = '2.0.0'
version = '2.0.1'
# The full version, including alpha/beta/rc tags.
release = version

4
src/core/abort.c
View file

@ -25,10 +25,6 @@
jmp_buf g_pre_test;
int setup_abort_test(void) {
return !setjmp(g_pre_test);
}
void criterion_abort_test(void) {
longjmp(g_pre_test, 1);
}

2
src/core/abort.h
View file

@ -29,6 +29,4 @@
extern jmp_buf g_pre_test;
int setup_abort_test(void);
#endif /* !ABORT_H_ */

2
src/core/runner.c
View file

@ -184,7 +184,7 @@ static void run_test_child(struct criterion_test *test,
send_event(PRE_TEST, NULL, 0);
struct timespec_compat ts;
if (setup_abort_test()) {
if (!setjmp(g_pre_test)) {
timer_start(&ts);
(test->test ? test->test : nothing)();
}