From e80a3cfb546f7a89c6ae4bc81aa008690fd7629c Mon Sep 17 00:00:00 2001
From: Peng Li <lipeng17@baidu.com>
Date: Mon, 13 Mar 2017 19:30:02 +0800
Subject: [PATCH] merge with latest code

---
 paddle/gserver/tests/CMakeLists.txt        | 3 +--
 paddle/gserver/tests/test_CRFLayerGrad.cpp | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/paddle/gserver/tests/CMakeLists.txt b/paddle/gserver/tests/CMakeLists.txt
index 6b1f2a62b9..3c4128b5b8 100644
--- a/paddle/gserver/tests/CMakeLists.txt
+++ b/paddle/gserver/tests/CMakeLists.txt
@@ -21,8 +21,7 @@ add_test(NAME test_LayerGrad
 ################ test_CRFLayerGrad ####################
 add_unittest_without_exec(test_CRFLayerGrad
     test_CRFLayerGrad.cpp
-    LayerGradUtil.cpp
-    TestUtil.cpp)
+    LayerGradUtil.cpp)
 add_test(NAME test_CRFLayerGrad
     COMMAND test_CRFLayerGrad)
 
diff --git a/paddle/gserver/tests/test_CRFLayerGrad.cpp b/paddle/gserver/tests/test_CRFLayerGrad.cpp
index c267dcd9ab..df14449291 100644
--- a/paddle/gserver/tests/test_CRFLayerGrad.cpp
+++ b/paddle/gserver/tests/test_CRFLayerGrad.cpp
@@ -19,7 +19,7 @@ limitations under the License. */
 #include "paddle/trainer/Trainer.h"
 
 #include "LayerGradUtil.h"
-#include "TestUtil.h"
+#include "paddle/testing/TestUtil.h"
 
 using namespace paddle;  // NOLINT
 
-- 
GitLab