[v2.0.1] Merge branch 'patch' (Fixes critical issue)

Snaipe · Sep 19, 2015 · 9f8d297 · 9f8d297
2 parents d75eb4f + 4e5d416
commit 9f8d297
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0
+current_version = 2.0.1
 commit = False
 
 [bumpversion:file:CMakeLists.txt]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-19  Franklin "Snaipe" Mathieu  <[email protected]>
+
+    * criterion: version 2.0.1
+    * Fix: Fixed wrong setjmp() usage making tests compiled with optimisations
+      crash.
+
 2015-09-14  Franklin "Snaipe" Mathieu  <[email protected]>
 
     * criterion: version 2.0.0

diff --git a/README.md b/README.md
@@ -39,9 +39,9 @@ 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 (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.0/criterion-v2.0.0-windows-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 (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.0.1/criterion-v2.0.1-windows-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)
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.0.0_b{build}-{branch}
+version: 2.0.1_b{build}-{branch}
 
 os: Visual Studio 2015
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -39,7 +39,7 @@
 # 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
 

diff --git a/src/abort.c b/src/abort.c
@@ -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);
 }
diff --git a/src/abort.h b/src/abort.h
@@ -29,6 +29,4 @@
 
 extern jmp_buf g_pre_test;
 
-int setup_abort_test(void);
-
 #endif /* !ABORT_H_ */
diff --git a/src/runner.c b/src/runner.c
@@ -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)();
     }