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

Tweaks for 'make check': Don't assume location of perl, or existence of /etc/hosts

This commit is contained in:
Brian Cox 2017-03-16 20:51:12 -07:00
parent 8bd86fe60d
commit aaee78c061
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -14,5 +14,5 @@ uninstall-hook:
check: check:
rm -Rf $(top_srcdir)/src/test-harness/twtest rm -Rf $(top_srcdir)/src/test-harness/twtest
cd $(top_srcdir)/src/test-harness && ./twtest.pl cd $(top_srcdir)/src/test-harness && perl ./twtest.pl
$(top_srcdir)/bin/twtest all $(top_srcdir)/bin/twtest all

2
Makefile.in
View File

@ -810,7 +810,7 @@ uninstall-hook:
check: check:
rm -Rf $(top_srcdir)/src/test-harness/twtest rm -Rf $(top_srcdir)/src/test-harness/twtest
cd $(top_srcdir)/src/test-harness && ./twtest.pl cd $(top_srcdir)/src/test-harness && perl ./twtest.pl
$(top_srcdir)/bin/twtest all $(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.

20
src/twtest/fileutil_t.cpp
View File

@ -47,17 +47,15 @@ using namespace std;
void TestFileUtil() void TestFileUtil()
{ {
if(cFileUtil::FileExists("/etc/hosts"))
{
TSTRING source, dest;
TSTRING source, dest; source = _T("/etc/hosts");
dest = _T("/tmp/dest");
source = _T("/etc/hosts"); bool blah = cFileUtil::Copy(source, dest);
dest = _T("/tmp/dest"); (void)blah;
bool blah = cFileUtil::Copy(source, dest); // TCOUT << _T("<") << wstr3 << _T(">") << std::endl;
(void)blah; }
// TCOUT << _T("<") << wstr3 << _T(">") << std::endl;
} }