From 5e5c441245276a2696ac1f840ebd261c7c14cfd4 Mon Sep 17 00:00:00 2001
From: liaogang <liaogang@baidu.com>
Date: Wed, 9 Aug 2017 20:16:16 +0800
Subject: [PATCH] Enable Python Unit Test before make install

---
 cmake/generic.cmake                   | 2 +-
 paddle/framework/CMakeLists.txt       | 5 +++++
 python/paddle/v2/framework/.gitignore | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 python/paddle/v2/framework/.gitignore

diff --git a/cmake/generic.cmake b/cmake/generic.cmake
index 957c20bcf60..2778b491285 100644
--- a/cmake/generic.cmake
+++ b/cmake/generic.cmake
@@ -411,7 +411,7 @@ function(py_test TARGET_NAME)
     set(multiValueArgs SRCS DEPS)
     cmake_parse_arguments(py_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})  
     add_test(NAME ${TARGET_NAME}
-             COMMAND env PYTHONPATH=${PADDLE_PYTHON_PACKAGE_DIR}
+             COMMAND env PYTHONPATH=${CMAKE_SOURCE_DIR}/python:${CMAKE_SOURCE_DIR}/paddle:${PADDLE_PYTHON_PACKAGE_DIR}
              python2 ${py_test_SRCS}
              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
   endif()
diff --git a/paddle/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt
index 6601918c90b..b7b61b597f3 100644
--- a/paddle/framework/CMakeLists.txt
+++ b/paddle/framework/CMakeLists.txt
@@ -35,6 +35,11 @@ py_proto_compile(framework_py_proto SRCS attribute.proto op_proto.proto op_desc.
 # Generate an empty __init__.py to make framework_py_proto as a valid python module.
 add_custom_target(framework_py_proto_init ALL COMMAND ${CMAKE_COMMAND} -E touch __init__.py)
 add_dependencies(framework_py_proto framework_py_proto_init)
+add_custom_command(TARGET framework_py_proto POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJ_ROOT}/python/paddle/v2/framework/proto
+    COMMAND cp *.py ${PROJ_ROOT}/python/paddle/v2/framework/proto/
+    COMMENT "Copy generated python proto into directory paddle/v2/framework/proto."
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 cc_library(backward SRCS backward.cc DEPS net_op)
 cc_test(backward_test SRCS backward_test.cc DEPS backward)
diff --git a/python/paddle/v2/framework/.gitignore b/python/paddle/v2/framework/.gitignore
new file mode 100644
index 00000000000..2ff540d5764
--- /dev/null
+++ b/python/paddle/v2/framework/.gitignore
@@ -0,0 +1 @@
+proto
-- 
GitLab