colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev/2435' of https://github.com/Tripwire/tripwire-open-source into dev/2435

This commit is contained in:
brc0x1 2017-03-14 13:08:00 -07:00
parent 58dafd1d9e 062523a60e
commit 91e19716d0
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -11,3 +11,8 @@ install-data-hook:
uninstall-hook: uninstall-hook:
rm -f ${prefix}/sbin/tripwire $(prefix)/sbin/twadmin $(prefix)/sbin/twprint $(prefix)/sbin/siggen rm -f ${prefix}/sbin/tripwire $(prefix)/sbin/twadmin $(prefix)/sbin/twprint $(prefix)/sbin/siggen
rm -Rf $(prefix)/doc rm -Rf $(prefix)/doc
check:
rm -Rf $(top_srcdir)/src/test-harness/twtest
cd $(top_srcdir)/src/test-harness && ./twtest.pl
$(top_srcdir)/bin/twtest all

5
Makefile.in
View File

@ -808,6 +808,11 @@ uninstall-hook:
rm -f ${prefix}/sbin/tripwire $(prefix)/sbin/twadmin $(prefix)/sbin/twprint $(prefix)/sbin/siggen rm -f ${prefix}/sbin/tripwire $(prefix)/sbin/twadmin $(prefix)/sbin/twprint $(prefix)/sbin/siggen
rm -Rf $(prefix)/doc rm -Rf $(prefix)/doc
check:
rm -Rf $(top_srcdir)/src/test-harness/twtest
cd $(top_srcdir)/src/test-harness && ./twtest.pl
$(top_srcdir)/bin/twtest all
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

2
src/cryptlib/zdeflate.cpp
View File

@ -236,7 +236,7 @@ int Deflator::longest_match(IPos cur_match)
if (prev_length >= good_match) { if (prev_length >= good_match) {
chain_length >>= 2; chain_length >>= 2;
} }
assert(strstart <= (unsigned)WINDOW_SIZE-MIN_LOOKAHEAD); //assert(strstart <= (unsigned)WINDOW_SIZE-MIN_LOOKAHEAD);
do { do {
assert(cur_match < strstart); assert(cur_match < strstart);

6
src/twtest/test.cpp
View File

@ -316,11 +316,13 @@ int _tmain(int argc, TCHAR** argv)
{ {
cTWUtil::PrintErrorMsg(error); cTWUtil::PrintErrorMsg(error);
ASSERT(false); ASSERT(false);
return 1;
} }
catch (...) catch (...)
{ {
TCERR << _T("Unhandled exception caught!"); TCERR << _T("Unhandled exception caught!");
ASSERT(false); ASSERT(false);
return 1;
} }
// make sure all the refrence counted objects have been destroyed // make sure all the refrence counted objects have been destroyed
@ -329,7 +331,9 @@ int _tmain(int argc, TCHAR** argv)
// force user to hit <CR> // force user to hit <CR>
return 1; std::cout << std::endl << "Tests completed" << std::endl;
return 0;
} }