From 82feb4b9a136f530290aff71cd912e56dd48994a Mon Sep 17 00:00:00 2001
From: Xuedong Luan <luanxuedong2009@gmail.com>
Date: Wed, 14 Sep 2022 14:02:35 -0700
Subject: [PATCH] Decouple the building of benchmarks and tests (#2439)

Summary:
Tests and benchmarks targets are now de-coupled.
That means they can be built independently.
Shared functionality is moved to a common utility library.

Resolves https://github.com/facebookincubator/velox/issues/1704

X-link: https://github.com/facebookincubator/velox/pull/2439

Reviewed By: Yuhta

Differential Revision: D39484543

Pulled By: kgpai

fbshipit-source-id: b8b0f3a2fec4651ee8b4fe9ca6304bd37b9be183
---
 csrc/velox/functions/rec/tests/BucketizeTest.cpp    | 4 ++--
 csrc/velox/functions/rec/tests/ComputeScoreTest.cpp | 4 ++--
 csrc/velox/functions/rec/tests/FirstXTest.cpp       | 4 ++--
 csrc/velox/functions/rec/tests/SigridHashTest.cpp   | 4 ++--
 csrc/velox/functions/tests/FunctionsTest.cpp        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/csrc/velox/functions/rec/tests/BucketizeTest.cpp b/csrc/velox/functions/rec/tests/BucketizeTest.cpp
index 25fb9b536..5eb98d406 100644
--- a/csrc/velox/functions/rec/tests/BucketizeTest.cpp
+++ b/csrc/velox/functions/rec/tests/BucketizeTest.cpp
@@ -14,10 +14,10 @@
 
 #include <velox/common/base/VeloxException.h>
 #include <velox/vector/SimpleVector.h>
-#include <velox/vector/tests/VectorTestBase.h>
+#include <velox/vector/tests/utils/VectorTestBase.h>
 
 #include "pytorch/torcharrow/csrc/velox/functions/functions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/TypeResolver.h"
 
 namespace facebook::velox {
diff --git a/csrc/velox/functions/rec/tests/ComputeScoreTest.cpp b/csrc/velox/functions/rec/tests/ComputeScoreTest.cpp
index dc3756b5b..f3cdc8482 100644
--- a/csrc/velox/functions/rec/tests/ComputeScoreTest.cpp
+++ b/csrc/velox/functions/rec/tests/ComputeScoreTest.cpp
@@ -14,10 +14,10 @@
 
 #include <velox/common/base/VeloxException.h>
 #include <velox/vector/SimpleVector.h>
-#include <velox/vector/tests/VectorMaker.h>
+#include <velox/vector/tests/utils/VectorMaker.h>
 
 #include "pytorch/torcharrow/csrc/velox/functions/functions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/TypeResolver.h"
 
 namespace facebook::velox {
diff --git a/csrc/velox/functions/rec/tests/FirstXTest.cpp b/csrc/velox/functions/rec/tests/FirstXTest.cpp
index c24604965..f8603ef71 100644
--- a/csrc/velox/functions/rec/tests/FirstXTest.cpp
+++ b/csrc/velox/functions/rec/tests/FirstXTest.cpp
@@ -14,10 +14,10 @@
 
 #include <velox/common/base/VeloxException.h>
 #include <velox/vector/SimpleVector.h>
-#include <velox/vector/tests/VectorTestBase.h>
+#include <velox/vector/tests/utils/VectorTestBase.h>
 
 #include "pytorch/torcharrow/csrc/velox/functions/functions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/TypeResolver.h"
 
 namespace facebook::velox {
diff --git a/csrc/velox/functions/rec/tests/SigridHashTest.cpp b/csrc/velox/functions/rec/tests/SigridHashTest.cpp
index 506e95871..f66dabe24 100644
--- a/csrc/velox/functions/rec/tests/SigridHashTest.cpp
+++ b/csrc/velox/functions/rec/tests/SigridHashTest.cpp
@@ -14,10 +14,10 @@
 
 #include <velox/common/base/VeloxException.h>
 #include <velox/vector/SimpleVector.h>
-#include <velox/vector/tests/VectorMaker.h>
+#include <velox/vector/tests/utils/VectorMaker.h>
 
 #include "pytorch/torcharrow/csrc/velox/functions/functions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/TypeResolver.h"
 
 namespace facebook::velox {
diff --git a/csrc/velox/functions/tests/FunctionsTest.cpp b/csrc/velox/functions/tests/FunctionsTest.cpp
index fd8175be4..1b144197d 100644
--- a/csrc/velox/functions/tests/FunctionsTest.cpp
+++ b/csrc/velox/functions/tests/FunctionsTest.cpp
@@ -15,7 +15,7 @@
 #include <velox/common/base/VeloxException.h>
 #include <velox/vector/SimpleVector.h>
 #include "pytorch/torcharrow/csrc/velox/functions/functions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/TypeResolver.h"
 
 namespace facebook::velox {