From fa2ed001532414b432813cb830ce55c1a4489db9 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Sat, 7 Sep 2019 09:57:23 -0700 Subject: [PATCH] [LibOS] Include Makefile.{config, rule} in test/*/Makefile --- LibOS/shim/test/benchmark/Makefile | 2 ++ LibOS/shim/test/fs/Makefile | 2 ++ LibOS/shim/test/inline/Makefile | 2 ++ LibOS/shim/test/native/Makefile | 2 ++ LibOS/shim/test/regression/Makefile | 2 ++ 5 files changed, 10 insertions(+) diff --git a/LibOS/shim/test/benchmark/Makefile b/LibOS/shim/test/benchmark/Makefile index 4f914a18..bfaa8f02 100644 --- a/LibOS/shim/test/benchmark/Makefile +++ b/LibOS/shim/test/benchmark/Makefile @@ -4,6 +4,8 @@ cxx_executables = $(patsubst %.cpp,%,$(wildcard *.cpp)) exec_target = $(c_executables) $(cxx_executables) target = $(exec_target) manifest +include ../../../../Scripts/Makefile.configs +include ../../../../Scripts/Makefile.manifest include ../../../../Scripts/Makefile.Test ifeq ($(findstring x86_64,$(SYS))$(findstring linux,$(SYS)),x86_64linux) diff --git a/LibOS/shim/test/fs/Makefile b/LibOS/shim/test/fs/Makefile index 751429c4..7ed3dadc 100644 --- a/LibOS/shim/test/fs/Makefile +++ b/LibOS/shim/test/fs/Makefile @@ -10,6 +10,8 @@ clean-extra += clean-tmp .PHONY: default default: all +include ../../../../Scripts/Makefile.configs +include ../../../../Scripts/Makefile.manifest include ../../../../Scripts/Makefile.Test ifeq ($(findstring x86_64,$(SYS))$(findstring linux,$(SYS)),x86_64linux) diff --git a/LibOS/shim/test/inline/Makefile b/LibOS/shim/test/inline/Makefile index 80cf4d12..367ce89e 100644 --- a/LibOS/shim/test/inline/Makefile +++ b/LibOS/shim/test/inline/Makefile @@ -7,6 +7,8 @@ target = $(c_executables) $(cxx_executables) manifest .PHONY: default default: all +include ../../../../Scripts/Makefile.configs +include ../../../../Scripts/Makefile.manifest include ../../../../Scripts/Makefile.Test .PHONY: crt_init-recurse diff --git a/LibOS/shim/test/native/Makefile b/LibOS/shim/test/native/Makefile index e0ad2288..913cad8d 100644 --- a/LibOS/shim/test/native/Makefile +++ b/LibOS/shim/test/native/Makefile @@ -5,6 +5,8 @@ manifests = $(patsubst %.template,%,$(wildcard *.manifest.template)) manifest exec_target = $(c_executables) $(cxx_executables) ls.manifest target = $(exec_target) $(manifests) +include ../../../../Scripts/Makefile.configs +include ../../../../Scripts/Makefile.manifest include ../../../../Scripts/Makefile.Test ifeq ($(findstring x86_64,$(SYS))$(findstring linux,$(SYS)),x86_64linux) diff --git a/LibOS/shim/test/regression/Makefile b/LibOS/shim/test/regression/Makefile index ed5eebdf..1bc3eabe 100644 --- a/LibOS/shim/test/regression/Makefile +++ b/LibOS/shim/test/regression/Makefile @@ -10,6 +10,8 @@ clean-extra += clean-tmp .PHONY: default default: all +include ../../../../Scripts/Makefile.configs +include ../../../../Scripts/Makefile.manifest include ../../../../Scripts/Makefile.Test ifeq ($(findstring x86_64,$(SYS))$(findstring linux,$(SYS)),x86_64linux)