Skip to content

Commit 6c0a222

Browse files
Load bsd.cfg by default in daca (#6009)
Moving `timercmp()` to `bsd.cfg` has caused syntax errors in daca (`error: syntax error: <) [syntaxError]`). Also we don't auto-detect BSD library usage.
1 parent 648f09f commit 6c0a222

2 files changed

Lines changed: 26 additions & 26 deletions

File tree

tools/donate_cpu_lib.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
1717
# Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
1818
# changes)
19-
CLIENT_VERSION = "1.3.54"
19+
CLIENT_VERSION = "1.3.55"
2020

2121
# Timeout for analysis with Cppcheck in seconds
2222
CPPCHECK_TIMEOUT = 30 * 60
@@ -733,7 +733,7 @@ def __iterate_files(self, path, has_include_cb):
733733

734734
def get_libraries(self, folder):
735735
print('Detecting library usage...')
736-
libraries = ['posix', 'gnu']
736+
libraries = ['posix', 'gnu', 'bsd']
737737

738738
# explicitly copy as assignments in python are references
739739
library_includes_re = copy.copy(self.__library_includes_re)

tools/donate_cpu_lib_test.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,32 @@ def _test_library_includes(tmpdir, libs, content, libinc_obj=None):
3333
assert libs == libs_found
3434

3535
def test_library_includes(tmpdir):
36-
_test_library_includes(tmpdir, ['posix', 'gnu'], '')
37-
_test_library_includes(tmpdir, ['posix', 'gnu'], '#include <stdio.h>')
38-
_test_library_includes(tmpdir, ['posix', 'gnu', 'boost'], '#include <boost/regex.hpp>')
39-
_test_library_includes(tmpdir, ['posix', 'gnu', 'python'], '#include "Python.h"')
40-
_test_library_includes(tmpdir, ['posix', 'gnu', 'libcerror', 'lua', 'opengl', 'qt'], '#include <QApplication>\n#include <GL/gl.h>\r#include "lua.h"\r\n#include <libcerror.h>')
41-
_test_library_includes(tmpdir, ['posix', 'gnu', 'microsoft_sal'], ' #include <sal.h>')
42-
_test_library_includes(tmpdir, ['posix', 'gnu', 'googletest'], '\t#include <gtest/gtest.h>')
43-
_test_library_includes(tmpdir, ['posix', 'gnu', 'microsoft_atl'], ' \t #include <atlbase.h>')
44-
_test_library_includes(tmpdir, ['posix', 'gnu', 'cairo'], '\t #include <cairo.h>')
45-
_test_library_includes(tmpdir, ['posix', 'gnu', 'gtk'], ' \t#include <glib-object.h>')
46-
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd'], '#include <sys/uio.h>\r\n')
47-
_test_library_includes(tmpdir, ['posix', 'gnu', 'libcurl'], '#include <curl/curl.h>\r')
48-
_test_library_includes(tmpdir, ['posix', 'gnu', 'sqlite3'], '#include <sqlite3.h>\n')
49-
_test_library_includes(tmpdir, ['posix', 'gnu', 'openmp'], '# include <omp.h>')
50-
_test_library_includes(tmpdir, ['posix', 'gnu', 'mfc'], '#\tinclude <afxwin.h>')
51-
_test_library_includes(tmpdir, ['posix', 'gnu', 'ruby'], '# \tinclude "ruby.h"')
52-
_test_library_includes(tmpdir, ['posix', 'gnu', 'zlib'], '#\t include <zlib.h>')
53-
_test_library_includes(tmpdir, ['posix', 'gnu', 'pcre'], '#include<pcre.h>')
54-
_test_library_includes(tmpdir, ['posix', 'gnu', 'pcre'], '#include "pcre.h"')
55-
_test_library_includes(tmpdir, ['posix', 'gnu', 'opengl'], '#include\t <GL/glut.h>')
56-
_test_library_includes(tmpdir, ['posix', 'gnu', 'nspr'], '#include\t"prtypes.h"')
57-
_test_library_includes(tmpdir, ['posix', 'gnu', 'lua'], '#include \t<lua.h>')
36+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd'], '')
37+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd'], '#include <stdio.h>')
38+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'boost'], '#include <boost/regex.hpp>')
39+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'python'], '#include "Python.h"')
40+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'libcerror', 'lua', 'opengl', 'qt'], '#include <QApplication>\n#include <GL/gl.h>\r#include "lua.h"\r\n#include <libcerror.h>')
41+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'microsoft_sal'], ' #include <sal.h>')
42+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'googletest'], '\t#include <gtest/gtest.h>')
43+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'microsoft_atl'], ' \t #include <atlbase.h>')
44+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'cairo'], '\t #include <cairo.h>')
45+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'gtk'], ' \t#include <glib-object.h>')
46+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'bsd'], '#include <sys/uio.h>\r\n')
47+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'libcurl'], '#include <curl/curl.h>\r')
48+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'sqlite3'], '#include <sqlite3.h>\n')
49+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'openmp'], '# include <omp.h>')
50+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'mfc'], '#\tinclude <afxwin.h>')
51+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'ruby'], '# \tinclude "ruby.h"')
52+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'zlib'], '#\t include <zlib.h>')
53+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'pcre'], '#include<pcre.h>')
54+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'pcre'], '#include "pcre.h"')
55+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'opengl'], '#include\t <GL/glut.h>')
56+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'nspr'], '#include\t"prtypes.h"')
57+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'lua'], '#include \t<lua.h>')
5858

5959
def test_match_multiple_time(tmpdir):
6060
libinc = LibraryIncludes()
6161

6262
# there was a bug that we would only match each library once successfully
63-
_test_library_includes(tmpdir, ['posix', 'gnu', 'zlib'], '#include <zlib.h>', libinc)
64-
_test_library_includes(tmpdir, ['posix', 'gnu', 'zlib'], '#include <zlib.h>', libinc)
63+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'zlib'], '#include <zlib.h>', libinc)
64+
_test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'zlib'], '#include <zlib.h>', libinc)

0 commit comments

Comments
 (0)