From 9b3c98850572f0729afe97ffde16d05a7e6e691b Mon Sep 17 00:00:00 2001 From: Cristian Cadar Date: Thu, 25 Jul 2019 22:22:55 +0100 Subject: Consolidated Expr-related include files into a single include/klee/Expr directory. This improves the organization of the code, and also makes it easier to reuse Expr outside KLEE. --- unittests/Assignment/AssignmentTest.cpp | 6 ++++-- unittests/Expr/ExprTest.cpp | 4 ++-- unittests/Solver/SolverTest.cpp | 12 +++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) (limited to 'unittests') diff --git a/unittests/Assignment/AssignmentTest.cpp b/unittests/Assignment/AssignmentTest.cpp index 0eaa28f1..872d3301 100644 --- a/unittests/Assignment/AssignmentTest.cpp +++ b/unittests/Assignment/AssignmentTest.cpp @@ -1,6 +1,8 @@ -#include "klee/util/ArrayCache.h" -#include "klee/util/Assignment.h" #include "gtest/gtest.h" + +#include "klee/Expr/ArrayCache.h" +#include "klee/Expr/Assignment.h" + #include #include diff --git a/unittests/Expr/ExprTest.cpp b/unittests/Expr/ExprTest.cpp index fba15535..3a7541e9 100644 --- a/unittests/Expr/ExprTest.cpp +++ b/unittests/Expr/ExprTest.cpp @@ -10,8 +10,8 @@ #include #include "gtest/gtest.h" -#include "klee/Expr.h" -#include "klee/util/ArrayCache.h" +#include "klee/Expr/ArrayCache.h" +#include "klee/Expr/Expr.h" using namespace klee; diff --git a/unittests/Solver/SolverTest.cpp b/unittests/Solver/SolverTest.cpp index b178ced3..b15fd64b 100644 --- a/unittests/Solver/SolverTest.cpp +++ b/unittests/Solver/SolverTest.cpp @@ -7,16 +7,18 @@ // //===----------------------------------------------------------------------===// -#include #include "gtest/gtest.h" -#include "klee/SolverCmdLine.h" -#include "klee/Constraints.h" -#include "klee/Expr.h" +#include "klee/Expr/ArrayCache.h" +#include "klee/Expr/Constraints.h" +#include "klee/Expr/Expr.h" #include "klee/Solver.h" -#include "klee/util/ArrayCache.h" +#include "klee/SolverCmdLine.h" + #include "llvm/ADT/StringExtras.h" +#include + using namespace klee; namespace { -- cgit 1.4.1