From 4184646e2ab92793daa0c267a19b2f9546b5df76 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Wed, 1 Feb 2017 14:35:36 +0100
Subject: [PATCH] CTest problem understood. No coded solution, but a note in
CTEST_CUSTOM_PRE_TEST.
---
pub/CHANGELOG | 3 ++-
pub/cmake/scripts/CTestCustom.cmake.in | 1 +
pub/lib/toplevel.cpp | 6 +-----
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/pub/CHANGELOG b/pub/CHANGELOG
index 12384c12..2899c558 100644
--- a/pub/CHANGELOG
+++ b/pub/CHANGELOG
@@ -1,7 +1,8 @@
Release 2.3.5a of
-- Revised CMake machinery to ensure that tests use freshly compiled library versions
+- CMake machinery now uses variables like ${library_name}_LIBRARY
- Renamed libfrida -> libfridacore, libtrivia -> libfridatrivia
+- Fully relying on implicit library dependencies (frida -> libfridacore -> libfridatrivia -> GSL)
- Ensure termination of functional tests by including the one-line script "exit(1)"
Release 2.3.4d of 28jan17:
diff --git a/pub/cmake/scripts/CTestCustom.cmake.in b/pub/cmake/scripts/CTestCustom.cmake.in
index 85ee8810..a6cae544 100644
--- a/pub/cmake/scripts/CTestCustom.cmake.in
+++ b/pub/cmake/scripts/CTestCustom.cmake.in
@@ -1 +1,2 @@
+set(CTEST_CUSTOM_PRE_TEST "echo To run ctest before make install, unset LD_LIBRARY_PATH")
set(CTEST_CUSTOM_POST_TEST "echo For details, see the log files in Testing/Temporary/")
diff --git a/pub/lib/toplevel.cpp b/pub/lib/toplevel.cpp
index 081d2154..9b5d6ec2 100644
--- a/pub/lib/toplevel.cpp
+++ b/pub/lib/toplevel.cpp
@@ -125,10 +125,8 @@ void CFrida::execute_cmd(const string cmdline)
CFrida::CFrida()
{
- cout << "DEBUG--00\n";
int line = 0;
try {
- cout << "DEBUG--01\n";
// Initializations:
NReadln::initialize(); // command-line dialog (readline and history)
line = 1;
@@ -138,7 +136,6 @@ CFrida::CFrida()
line = 3;
fbase_initialize();
line = 4;
- cout << "DEBUG--05\n";
fassign_initialize();
line = 5;
fstring_initialize();
@@ -151,7 +148,6 @@ CFrida::CFrida()
cout << "BUG: atexit registration failed\n";
exit(EXIT_FAILURE);
}
- cout << "DEBUG--09\n";
// time monitor:
line = 9;
clock_start = clock();
@@ -207,7 +203,7 @@ void CFrida::execute_file(const string fnam)
{
int lineno = 0;
try {
- cout << "X executing " << fnam << "\n";
+ cout << "executing " << fnam << "\n";
std::ifstream F(fnam);
while (true) {
string cmdline = NMacro::readln("", &F, &lineno);
--
GitLab