mirror of
https://github.com/GothenburgBitFactory/timewarrior.git
synced 2025-07-07 20:06:39 +02:00
Rename atomic
to AtomicFileTest
- Avoid possible clash with lib atomic on macOS, e.g. in /Library/Developer/CommandLineTools/usr/include/c++/v1/memory:668 Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
This commit is contained in:
parent
551964eb15
commit
368d033ce5
5 changed files with 17 additions and 18 deletions
2
test/.gitignore
vendored
2
test/.gitignore
vendored
|
@ -1,5 +1,5 @@
|
|||
all.log
|
||||
atomic
|
||||
AtomicFileTest
|
||||
data.t
|
||||
exclusion.t
|
||||
helper.t
|
||||
|
|
14
test/AtomicFile.t
Executable file
14
test/AtomicFile.t
Executable file
|
@ -0,0 +1,14 @@
|
|||
#!/bin/sh
|
||||
BASEDIR=$(dirname "$0")
|
||||
|
||||
if [ "$(uname -s)" = "Darwin" ] ; then
|
||||
DLL_TOOL="otool -L"
|
||||
else
|
||||
DLL_TOOL="ldd"
|
||||
fi
|
||||
|
||||
if ${DLL_TOOL} ${BASEDIR}/AtomicFileTest | grep -q 'libfiu' ; then
|
||||
exec fiu-run -x ${BASEDIR}/AtomicFileTest
|
||||
else
|
||||
exec ${BASEDIR}/AtomicFileTest
|
||||
fi
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <sstream>
|
||||
#include <memory>
|
||||
#include <string.h>
|
||||
#include <string>
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include <cstdlib>
|
|
@ -34,7 +34,7 @@ include_directories (${CMAKE_SOURCE_DIR}
|
|||
include_directories (${CMAKE_INSTALL_PREFIX}/include)
|
||||
link_directories(${CMAKE_INSTALL_PREFIX}/lib)
|
||||
|
||||
set (test_SRCS atomic data.t exclusion.t helper.t interval.t range.t rules.t util.t TagInfoDatabase.t)
|
||||
set (test_SRCS AtomicFileTest data.t exclusion.t helper.t interval.t range.t rules.t util.t TagInfoDatabase.t)
|
||||
|
||||
add_custom_target (test ./run_all --verbose
|
||||
DEPENDS ${test_SRCS}
|
||||
|
@ -47,4 +47,3 @@ endforeach (src_FILE)
|
|||
|
||||
configure_file(run_all run_all COPYONLY)
|
||||
configure_file(problems problems COPYONLY)
|
||||
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
#!/bin/sh
|
||||
BASEDIR=$(dirname "$0")
|
||||
|
||||
if [ "$(uname -s)" = "Darwin" ] ; then
|
||||
DLL_TOOL="otool -L"
|
||||
else
|
||||
DLL_TOOL="ldd"
|
||||
fi
|
||||
|
||||
if ${DLL_TOOL} ${BASEDIR}/atomic | grep -q 'libfiu' ; then
|
||||
exec fiu-run -x ${BASEDIR}/atomic
|
||||
else
|
||||
exec ${BASEDIR}/atomic
|
||||
fi
|
Loading…
Add table
Add a link
Reference in a new issue