jepler/stepcode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

merge into: jepler:master
Branches Tags
jepler:master
jepler:enable-additional-tests
jepler:inverse_attr3_windows
jepler:lazy2
jepler:sanitize
jepler:test-parallelism-failures
jepler:mac-inverse-attr3-failure
jepler:mismatch-new-delete
jepler:appveyor-single-thread-test
jepler:nullptr-bool
jepler:review/327
jepler:mp/dbg-osx-lazy
jepler:hj/thread-safety
jepler:mp/type-named-type
jepler:incomplete_tests
jepler:mp/impossible-condition
jepler:mp/incomplete_instance
jepler:mp/test-binary-write-p21
jepler:v0.8
jepler:v0.7
jepler:v0.6
jepler:v0.5
jepler:v0.4
jepler:v0.3
jepler:v0.2
jepler:v0.1
...
pull from: jepler:test-parallelism-failures
Branches Tags
jepler:enable-additional-tests
jepler:inverse_attr3_windows
jepler:lazy2
jepler:sanitize
jepler:test-parallelism-failures
jepler:master
jepler:mac-inverse-attr3-failure
jepler:mismatch-new-delete
jepler:appveyor-single-thread-test
jepler:nullptr-bool
jepler:review/327
jepler:mp/dbg-osx-lazy
jepler:hj/thread-safety
jepler:mp/type-named-type
jepler:incomplete_tests
jepler:mp/impossible-condition
jepler:mp/incomplete_instance
jepler:mp/test-binary-write-p21
jepler:v0.8
jepler:v0.7
jepler:v0.6
jepler:v0.5
jepler:v0.4
jepler:v0.3
jepler:v0.2
jepler:v0.1

5 commits
master ... test-paral

Author SHA1 Message Date
Jeff Epler
d39fbaf4d7 sc_version_string: Use temporary names resilient against parallel builds 
In #359 I identify a race condition between multiple parallel invocations
of cmake, which can arise naturally during ctests.  Now that the file
contents will not change without an intervening git commit, it is
sufficient to ensure that the parallel invocations use distinct temporary
file names with high probability.
 2017-08-21 08:31:05 -05:00
Jeff Epler
e422262877 sc_version_string: omit the date and time when testing 
As analyzed in #359, if the header contains the current time, it will
be updated while running the testsuite; this, in turn, causes multiple
cmake processes to attempt to update targets like lib/libexpress.so.2.0.0
at the same time, causing test failures.
 2017-08-21 08:31:00 -05:00
Mark
71fe947ff5 Merge pull request #361 from jepler/appveyor-single-thread-test 
appveyor build: don't use ctest parallelism
 2017-08-19 17:12:28 -04:00
Mark
beb2a595f1 Merge pull request #357 from jepler/nullptr-bool 
Fix build error with g++ 6.3 (Debian Stretch)
 2017-08-19 15:41:33 -04:00
Jeff Epler
0fbc3c0c84 Fix build error with g++ 6.3 (Debian Stretch) 
On this platform, TEST_NULLPTR fails, even though nullptr and
nullptr_t are supported:

/home/jepler/src/stepcode/build/CMakeFiles/CMakeTmp/src.cxx:4:23:
    error: converting to 'bool' from 'std::nullptr_t'
    requires direct-initialization [-fpermissive]
 int main() {return !!f();}
                      ~^~

Subsequent to this failure, the workaround definitions in sc_nullptr.h
prevent standard C++ headers (which must refer to real nullptr) to fail.

The failure occurs because the C++ standard apparently does not state
that operator! may be used on nullptr.  Despite this, some compilers
have historically allowed it.  g++ 6.3's behavior appears to be aligned
with the standard.

As requested by @brlcad, ensure that the function 'f' is used from main,
to avoid a clever (but not nullptr-supporting) compiler from somehow
skipping 'f' altogether, creating a false positive for nullptr support.
 2017-08-15 06:50:56 -05:00
2 changed files with 9 additions and 5 deletions
Show stats Expand all files Collapse all files

2
cmake/SC_Config_Headers.cmake
View file

@ -80,7 +80,7 @@ std::cout << \"1s is \"<< std::chrono::duration_cast<std::chrono::milliseconds>(
set( TEST_NULLPTR " set( TEST_NULLPTR "
#include <cstddef> #include <cstddef>
std::nullptr_t f() {return nullptr;} std::nullptr_t f() {return nullptr;}
int main() {return !!f();} int main() {return !(f() == f());}
" ) " )
cmake_push_check_state() cmake_push_check_state()
if( UNIX ) if( UNIX )

12
cmake/sc_version_string.cmake
View file

@ -8,6 +8,7 @@
# http://www.cmake.org/pipermail/cmake/2009-February/027014.html # http://www.cmake.org/pipermail/cmake/2009-February/027014.html
set(SC_IS_SUBBUILD "@SC_IS_SUBBUILD@") set(SC_IS_SUBBUILD "@SC_IS_SUBBUILD@")
set(SC_ENABLE_TESTING "@SC_ENABLE_TESTING@")
set(SC_VERSION_HEADER "${BINARY_DIR}/include/sc_version_string.h") set(SC_VERSION_HEADER "${BINARY_DIR}/include/sc_version_string.h")
@ -47,7 +48,9 @@ string(REPLACE "\n" "" GIT_COMMIT_ID ${GIT_COMMIT_ID})
#once cmake_minimum_required is >= 2.8.11, we can use TIMESTAMP: #once cmake_minimum_required is >= 2.8.11, we can use TIMESTAMP:
#string(TIMESTAMP date_time_string) #string(TIMESTAMP date_time_string)
if(UNIX) if(SC_ENABLE_TESTING)
set (date_time_string "NA - disabled for testing")
elseif(UNIX)
execute_process(COMMAND date "+%d %b %Y %H:%M" OUTPUT_VARIABLE date_time_string OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND date "+%d %b %Y %H:%M" OUTPUT_VARIABLE date_time_string OUTPUT_STRIP_TRAILING_WHITESPACE)
elseif(WIN32) elseif(WIN32)
execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE currentDate OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE currentDate OUTPUT_STRIP_TRAILING_WHITESPACE)
@ -75,9 +78,10 @@ set(header_string "/* sc_version_string.h - written by cmake. Changes will be lo
) )
#don't update the file unless somethig changed #don't update the file unless somethig changed
file(WRITE ${SC_VERSION_HEADER}.tmp ${header_string}) string(RANDOM tmpsuffix)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_VERSION_HEADER}.tmp ${SC_VERSION_HEADER}) file(WRITE ${SC_VERSION_HEADER}.${tmpsuffix} ${header_string})
execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${SC_VERSION_HEADER}.tmp) execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_VERSION_HEADER}.${tmpsuffix} ${SC_VERSION_HEADER})
execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${SC_VERSION_HEADER}.${tmpsuffix})
if(NOT SC_IS_SUBBUILD) if(NOT SC_IS_SUBBUILD)
message("-- sc_version_string.h is up-to-date.") message("-- sc_version_string.h is up-to-date.")