picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4547 from keszybz/two-testsuite-tweaks

Browse source 
Two testsuite tweaks
This commit is contained in:
Lennart Poettering 2016-11-02 23:06:53 -06:00 committed by GitHub
parent b23f2b72bf 1258f08898
commit b2c82a7f2f
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hwdb/parse_hwdb.py
View file

@ -49,6 +49,12 @@ except ImportError:
ecodes = None
print('WARNING: evdev is not available')
try:
from functools import lru_cache
except ImportError:
# don't do caching on old python
lru_cache = lambda: (lambda f: f)
EOL = LineEnd().suppress()
EMPTYLINE = LineStart() + LineEnd()
COMMENTLINE = pythonStyleComment + EOL
@ -62,7 +68,7 @@ TYPES = {'mouse': ('usb', 'bluetooth', 'ps2', '*'),
'keyboard': ('name', ),
}
@functools.lru_cache()
@lru_cache()
def hwdb_grammar():
ParserElement.setDefaultWhitespaceChars('')
@ -83,7 +89,7 @@ def hwdb_grammar():
return grammar
@functools.lru_cache()
@lru_cache()
def property_grammar():
ParserElement.setDefaultWhitespaceChars(' ')

7
src/journal/test-compress.c
View file

@ -247,6 +247,9 @@ int main(int argc, char *argv[]) {
"text\0foofoofoofoo AAAA aaaaaaaaa ghost busters barbarbar FFF"
"foofoofoofoo AAAA aaaaaaaaa ghost busters barbarbar FFF";
/* The file to test compression on can be specified as the first argument */
const char *srcfile = argc > 1 ? argv[1] : argv[0];
char data[512] = "random\0";
char huge[4096*1024];
@ -275,7 +278,7 @@ int main(int argc, char *argv[]) {
huge, sizeof(huge), true);
test_compress_stream(OBJECT_COMPRESSED_XZ, "xzcat",
compress_stream_xz, decompress_stream_xz, argv[0]);
compress_stream_xz, decompress_stream_xz, srcfile);
#else
log_info("/* XZ test skipped */");
#endif
@ -297,7 +300,7 @@ int main(int argc, char *argv[]) {
huge, sizeof(huge), true);
test_compress_stream(OBJECT_COMPRESSED_LZ4, "lz4cat",
compress_stream_lz4, decompress_stream_lz4, argv[0]);
compress_stream_lz4, decompress_stream_lz4, srcfile);
test_lz4_decompress_partial();
#else