From be4260c83711fa4efe6588a7dfe43fa721ca9b8b Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Fri, 21 Jul 2017 16:30:41 +0100 Subject: Remove Autoconf/Makefile build system and adjust the TravisCI configuration, TravisCI scripts and Dockerfile build appropriately. There are a bunch of clean ups this enables but this commit doesn't attempt them. We can do that in future commits. --- unittests/Assignment/Makefile | 10 ---------- unittests/Expr/Makefile | 10 ---------- unittests/Makefile | 29 ----------------------------- unittests/Ref/Makefile | 10 ---------- unittests/Solver/Makefile | 20 -------------------- unittests/TreeStream/Makefile | 11 ----------- 6 files changed, 90 deletions(-) delete mode 100644 unittests/Assignment/Makefile delete mode 100644 unittests/Expr/Makefile delete mode 100644 unittests/Makefile delete mode 100644 unittests/Ref/Makefile delete mode 100644 unittests/Solver/Makefile delete mode 100644 unittests/TreeStream/Makefile (limited to 'unittests') diff --git a/unittests/Assignment/Makefile b/unittests/Assignment/Makefile deleted file mode 100644 index aeb65857..00000000 --- a/unittests/Assignment/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -##===- unittests/Assignment/Makefile -----------------------*- Makefile -*-===## - -LEVEL := ../.. -include $(LEVEL)/Makefile.config - -TESTNAME := Assignment -USEDLIBS := kleaverExpr.a -LINK_COMPONENTS := support - -include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest diff --git a/unittests/Expr/Makefile b/unittests/Expr/Makefile deleted file mode 100644 index e64ce47a..00000000 --- a/unittests/Expr/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -##===- unittests/Expr/Makefile -----------------------------*- Makefile -*-===## - -LEVEL := ../.. -include $(LEVEL)/Makefile.config - -TESTNAME := Expr -USEDLIBS := kleaverExpr.a kleeBasic.a -LINK_COMPONENTS := support - -include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest diff --git a/unittests/Makefile b/unittests/Makefile deleted file mode 100644 index 582b8d8d..00000000 --- a/unittests/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -##===- unittests/Makefile ----------------------------------*- Makefile -*-===## -# -# The KLEE Symbolic Virtual Machine -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -# ===----------------------------------------------------------------------===## - -LEVEL = .. - -include $(LEVEL)/Makefile.config - -LIBRARYNAME = UnitTestMain -BUILD_ARCHIVE = 1 -CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ -CPP.Flags += -Wno-variadic-macros - -# FIXME: Parallel dirs is broken? -DIRS = Expr Solver Ref Assignment TreeStream - -include $(LEVEL)/Makefile.common - -# Remove -fno-rtti as this prevents typeid() being used -# in gtest -CXX.Flags := $(filter-out -fno-rtti,$(CXX.Flags)) - -clean:: - $(Verb) $(RM) -f *Tests diff --git a/unittests/Ref/Makefile b/unittests/Ref/Makefile deleted file mode 100644 index 10c4bebd..00000000 --- a/unittests/Ref/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -##===- unittests/Expr/Makefile -----------------------------*- Makefile -*-===## - -LEVEL := ../.. -include $(LEVEL)/Makefile.config - -TESTNAME := RefTest -USEDLIBS := kleaverExpr.a kleeBasic.a -LINK_COMPONENTS := support - -include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest diff --git a/unittests/Solver/Makefile b/unittests/Solver/Makefile deleted file mode 100644 index 4b58628f..00000000 --- a/unittests/Solver/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -##===- unittests/Solver/Makefile ---------------------------*- Makefile -*-===## - -LEVEL := ../.. -include $(LEVEL)/Makefile.config - -TESTNAME := Solver -USEDLIBS := kleaverSolver.a kleaverExpr.a kleeSupport.a kleeBasic.a -LINK_COMPONENTS := support - -include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest - -ifneq ($(ENABLE_STP),0) - LIBS += $(STP_LDFLAGS) -endif - -ifneq ($(ENABLE_Z3),0) - LIBS += $(Z3_LDFLAGS) -endif - -include $(PROJ_SRC_ROOT)/MetaSMT.mk diff --git a/unittests/TreeStream/Makefile b/unittests/TreeStream/Makefile deleted file mode 100644 index a56659b9..00000000 --- a/unittests/TreeStream/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -##===- unittests/Expr/Makefile -----------------------------*- Makefile -*-===## - -LEVEL := ../.. -include $(LEVEL)/Makefile.config - -TESTNAME := TreeStreamTest -USEDLIBS := kleeBasic.a kleeSupport.a -LINK_COMPONENTS := support - -include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest - -- cgit 1.4.1