Merge branch 'master' of github.com:lailongwei/llbc

CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_COLOR_MAKEFILE on)
 
 # Disable min/max macro define(on MSVC compiler).
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX"
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX")
 endif()
 
 # Set llbc core lib directory.

llbc/src/core/os/OS_Process.cpp

@@ -424,18 +424,18 @@ int LLBC_HandleCrash(const LLBC_String &dumpFilePath,
         if (LLBC_GetLastError() != LLBC_ERROR_SUCCESS)
             return LLBC_FAILED;
 
-        // Write new core pattern.
+        // Write new core pattern(may not have permission to open core_pattern file, ignore error).
         LLBC_File corePatternFile;
-        if (corePatternFile.Open(LLBC_INL_NS __corePatternPath, LLBC_FileMode::Write) != LLBC_OK)
-            return LLBC_FAILED;
-
-        // If failed, try write old core pattern.
-        if (corePatternFile.Write(dumpFilePath) != LLBC_OK)
+        if (corePatternFile.Open(LLBC_INL_NS __corePatternPath, LLBC_FileMode::Write) == LLBC_OK)
         {
-            corePatternFile.Seek(LLBC_FileSeekOrigin::Begin, 0);
-            corePatternFile.Write(oldCorePattern);
-
-            return LLBC_FAILED;
+            // If failed, try write old core pattern.
+            if (corePatternFile.Write(dumpFilePath) != LLBC_OK)
+            {
+                corePatternFile.Seek(LLBC_FileSeekOrigin::Begin, 0);
+                corePatternFile.Write(oldCorePattern);
+
+                return LLBC_FAILED;
+            }
         }
     }
 

tools/premake/premake5.lua

@@ -502,7 +502,14 @@ project "pyllbc"
                 string.gsub(llbc_output_dir, "/", "\\"),
                 pyllbc_testsuite_output_path_win))
     filter { "system:not windows" }
-        -- Do nothing.
+        postbuildcommands(
+            string.format(
+                "\\cp -rf \"%s\"/libllbc*.so \"%s\"/",
+                    llbc_output_dir, pyllbc_testsuite_output_path))
+        postbuildcommands(
+            string.format(
+                "\\cp -rf \"%s\"/llbc*.so \"%s\"/",
+                    llbc_output_dir, pyllbc_testsuite_output_path))
     filter {}
 
     -- postbuild: Copy misc files.

wrap/pyllbc/testsuite/app/__init__.py

@@ -1 +1 @@
-__author__ = 'Administrator'
+# -*- coding: utf-8 -*-

wrap/pyllbc/testsuite/common/__init__.py

@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-"""
-"""
-
 
 from testcase_llbcinfo import LLBCInfoTest
 from testcase_stream import StreamTest