Split up analyzer handling part

.travis.yml

@@ -6,6 +6,12 @@ services:
 
 matrix:
   include:
+    - os: linux
+      name: "Analyzer test cases"
+      sudo: required
+      dist: xenial
+      python: "2.7"
+      env: CC_MODULE=analyzer
     - os: linux
       sudo: required
       dist: xenial
@@ -21,6 +27,12 @@ matrix:
       dist: xenial
       python: "2.7"
       env: DATABASE=psql_pg8000
+    - os: osx
+      osx_image: xcode9.4
+      name: "Analyzer test cases"
+      sudo: false
+      language: generic
+      env: CC_MODULE=analyzer
     - os: osx
       osx_image: xcode9.4
       sudo: false
@@ -95,5 +107,15 @@ addons:
 script:
     - make clean_travis
     - make package
-    - if [[ ! -z "$DATABASE" ]]; then make test_matrix_${DATABASE}; else make test; fi
+    - >
+      if [[ "$CC_MODULE" = "analyzer" ]]; then
+        make -C analyzer test_unit test_functional test_tu_collector;
+        if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
+          make -C analyzer test_build_logger
+        fi
+      elif [[ ! -z "$DATABASE" ]]; then
+        make test_matrix_${DATABASE};
+      else
+        make test;
+      fi
     - make clean_travis

Makefile

@@ -12,8 +12,11 @@ CC_BUILD_DOCS_DIR = $(CC_BUILD_WEB_DIR)/docs
 CC_BUILD_WEB_PLUGINS_DIR = $(CC_BUILD_SCRIPTS_DIR)/plugins
 CC_BUILD_API_DIR = $(CC_BUILD_SCRIPTS_DIR)/codechecker-api
 CC_BUILD_LIB_DIR = $(CC_BUILD_DIR)/lib/python2.7
+CC_BUILD_LIBCC_DIR = $(CC_BUILD_LIB_DIR)/libcodechecker
 CC_BUILD_GEN_DIR = $(CC_BUILD_LIB_DIR)/gencodechecker
 
+CC_ANALYZER = $(CURRENT_DIR)/analyzer
+
 # Root of the repository.
 ROOT = $(CURRENT_DIR)
 
@@ -68,7 +71,14 @@ package: clean_package build_dir gen-docs thrift userguide build_plist_to_html b
 	cp -r $(BUILD_DIR)/thrift/v*/gen-js/* $(CC_BUILD_API_DIR)
 
 	# Copy libraries.
-	cp -r $(ROOT)/libcodechecker $(CC_BUILD_LIB_DIR)
+	mkdir -p $(CC_BUILD_LIBCC_DIR) && \
+	cp -r $(ROOT)/libcodechecker/* $(CC_BUILD_LIBCC_DIR) && \
+	cp -r $(CC_ANALYZER)/cmd/* $(CC_BUILD_LIBCC_DIR)/libhandlers && \
+	cp -r $(CC_ANALYZER)/codechecker $(CC_BUILD_LIB_DIR)
+
+	# Copy sub-commands.
+	cp $(ROOT)/bin/* $(CC_BUILD_DIR)/bin && \
+	cp $(CC_ANALYZER)/bin/* $(CC_BUILD_DIR)/bin
 
 	# Copy documentation files.
 	mkdir -p $(CC_BUILD_DOCS_DIR) && \
@@ -80,7 +90,9 @@ package: clean_package build_dir gen-docs thrift userguide build_plist_to_html b
 	cp -r $(ROOT)/config $(CC_BUILD_DIR) && \
 	./scripts/build/extend_version_file.py -r $(ROOT) -b $(BUILD_DIR) && \
 	mkdir -p $(CC_BUILD_DIR)/cc_bin && \
-	./scripts/build/create_commands.py -b $(BUILD_DIR) $(ROOT)/bin
+	./scripts/build/create_commands.py -b $(BUILD_DIR) \
+		$(ROOT)/bin \
+		$(CC_ANALYZER)/bin
 
 	# Copy web client files.
 	mkdir -p $(CC_BUILD_WEB_DIR) && \
@@ -190,3 +202,10 @@ clean_plist_to_html:
 
 clean_tu_collector:
 	rm -rf vendor/tu_collector/build
+
+clean_travis:
+	# Clean CodeChecker config files stored in the users home directory.
+	rm -rf ~/.codechecker*
+
+test_analyzer:
+	$(MAKE) -C $(CC_ANALYZER) test

analyzer/.noserc

@@ -0,0 +1,13 @@
+[nosetests]
+
+# increase verbosity level
+verbosity=3
+
+# more detailed error messages on failed asserts
+detailed-errors=1
+
+# stop running tests on first error
+stop=1
+
+# do not capture stdout
+#nocapture=1

analyzer/Makefile

@@ -0,0 +1,24 @@
+-include Makefile.local
+
+CURRENT_DIR = $(shell pwd)
+
+# Root of the repository.
+ROOT = $(CURRENT_DIR)/..
+
+ACTIVATE_DEV_VENV ?= . venv_dev/bin/activate
+
+VENV_DEV_REQ_FILE ?= requirements_py/dev/requirements.txt
+VENV_TEST_REQ_FILE ?= requirements_py/test/requirements.txt
+
+include tests/Makefile
+
+venv_dev:
+	# Create a virtual environment for development.
+	virtualenv -p python2 venv_dev && \
+		$(ACTIVATE_DEV_VENV) && pip install -r $(VENV_DEV_REQ_FILE) && \
+		pip install -r $(VENV_TEST_REQ_FILE)
+
+clean_venv_dev:
+	rm -rf venv_dev
+
+# TODO: add targets to build analyzer separately.

libcodechecker/libhandlers/analyze.py → analyzer/cmd/analyze.py

@@ -16,12 +16,13 @@
 import shutil
 import sys
 
+from codechecker.analyze import analyzer
+from codechecker.analyze.analyzers import analyzer_types
+from codechecker.buildlog import log_parser
+
 from libcodechecker import logger
 from libcodechecker import package_context
 from libcodechecker import skiplist_handler
-from libcodechecker.analyze import analyzer
-from libcodechecker.analyze.analyzers import analyzer_types
-from libcodechecker.log import log_parser
 from libcodechecker.util import RawDescriptionDefaultHelpFormatter, \
     load_json_or_empty
 

libcodechecker/libhandlers/analyzers.py → analyzer/cmd/analyzers.py

@@ -14,10 +14,11 @@
 import argparse
 import subprocess
 
+from codechecker.analyze.analyzers import analyzer_types
+
 from libcodechecker import logger
 from libcodechecker import package_context
 from libcodechecker import output_formatters
-from libcodechecker.analyze.analyzers import analyzer_types
 
 LOG = logger.get_logger('system')
 

libcodechecker/libhandlers/check.py → analyzer/cmd/check.py

@@ -17,10 +17,11 @@
 import shutil
 import tempfile
 
+from codechecker.analyze.analyzers import analyzer_types
+
 from libcodechecker import logger
 from libcodechecker import libhandlers
 from libcodechecker import package_context
-from libcodechecker.analyze.analyzers import analyzer_types
 from libcodechecker.util import RawDescriptionDefaultHelpFormatter
 
 LOG = logger.get_logger('system')

libcodechecker/libhandlers/checkers.py → analyzer/cmd/checkers.py

@@ -13,10 +13,11 @@
 import argparse
 import os
 
+from codechecker.analyze.analyzers import analyzer_types
+
 from libcodechecker import package_context
 from libcodechecker import logger
 from libcodechecker import output_formatters
-from libcodechecker.analyze.analyzers import analyzer_types
 from libcodechecker.env import get_check_env
 
 LOG = logger.get_logger('system')

libcodechecker/libhandlers/log.py → analyzer/cmd/log.py

@@ -17,10 +17,11 @@
 import argparse
 import os
 
+from codechecker.buildlog import build_manager
+from codechecker.buildlog.host_check import check_intercept
+
 from libcodechecker import package_context
 from libcodechecker import logger
-from libcodechecker.log import build_manager
-from libcodechecker.log.host_check import check_intercept
 
 
 def get_argparser_ctor_args():

libcodechecker/analyze/analysis_manager.py → analyzer/codechecker/analyze/analysis_manager.py

@@ -20,15 +20,15 @@
 import zipfile
 
 from libcodechecker import util, plist_parser
-from libcodechecker.analyze import gcc_toolchain
-from libcodechecker.analyze.analyzers import analyzer_clangsa
-from libcodechecker.analyze.analyzers import analyzer_types
-from libcodechecker.analyze.statistics_collector \
-    import SpecialReturnValueCollector
 from libcodechecker.env import get_check_env
 from libcodechecker.logger import get_logger
 from tu_collector import tu_collector
 
+from . import gcc_toolchain
+from .analyzers import analyzer_clangsa
+from .analyzers import analyzer_types
+from .statistics_collector import SpecialReturnValueCollector
+
 LOG = get_logger('analyzer')
 
 

libcodechecker/analyze/analyzer.py → analyzer/codechecker/analyze/analyzer.py

@@ -19,16 +19,13 @@
 import time
 
 from libcodechecker.logger import get_logger
-from libcodechecker.analyze import analysis_manager
-from libcodechecker.analyze import pre_analysis_manager
-from libcodechecker.analyze.analyzers import analyzer_types
-from libcodechecker.analyze.analyzers.analyzer_clangsa import ClangSA
-from libcodechecker.analyze.statistics_collector \
-    import SpecialReturnValueCollector
-from libcodechecker.analyze.statistics_collector \
-    import ReturnValueCollector
 from libcodechecker.env import get_check_env
 
+from . import analysis_manager, pre_analysis_manager
+from .analyzers import analyzer_types
+from .analyzers.analyzer_clangsa import ClangSA
+from .statistics_collector import SpecialReturnValueCollector
+from .statistics_collector import ReturnValueCollector
 
 LOG = get_logger('analyzer')
 

libcodechecker/analyze/analyzers/analyzer_clang_tidy.py → analyzer/codechecker/analyze/analyzers/analyzer_clang_tidy.py

@@ -14,17 +14,18 @@
 import shlex
 import subprocess
 
-from libcodechecker.analyze import host_check
-from libcodechecker.analyze.analyzers import analyzer_base
-from libcodechecker.analyze.analyzers import config_handler_clang_tidy
-from libcodechecker.analyze.analyzers import result_handler_clang_tidy
-from libcodechecker.analyze.analyzers.analyzer_clangsa import ClangSA
-from libcodechecker.analyze.analyzer_env import \
-    extend_analyzer_cmd_with_resource_dir
 from libcodechecker.env import get_check_env
 from libcodechecker.logger import get_logger
 from libcodechecker.util import get_binary_in_path, replace_env_var
 
+from .. import host_check
+from ..analyzer_env import extend_analyzer_cmd_with_resource_dir
+
+from . import analyzer_base
+from . import config_handler_clang_tidy
+from . import result_handler_clang_tidy
+from .analyzer_clangsa import ClangSA
+
 LOG = get_logger('analyzer')
 
 

libcodechecker/analyze/analyzers/analyzer_clangsa.py → analyzer/codechecker/analyze/analyzers/analyzer_clangsa.py

@@ -16,18 +16,18 @@
 import shlex
 import subprocess
 
-from libcodechecker.analyze import host_check
-from libcodechecker.analyze.analyzers import analyzer_base
-from libcodechecker.analyze.analyzers import config_handler_clangsa
-from libcodechecker.analyze.analyzers import ctu_triple_arch
-from libcodechecker.analyze.analyzers.result_handler_clangsa import \
-    ResultHandlerClangSA
-from libcodechecker.analyze.analyzer_env import \
-    extend_analyzer_cmd_with_resource_dir
 from libcodechecker.env import get_check_env
 from libcodechecker.logger import get_logger
 from libcodechecker.util import get_binary_in_path, replace_env_var
 
+from .. import host_check
+from ..analyzer_env import extend_analyzer_cmd_with_resource_dir
+
+from . import analyzer_base
+from . import config_handler_clangsa
+from . import ctu_triple_arch
+from .result_handler_clangsa import ResultHandlerClangSA
+
 LOG = get_logger('analyzer')
 
 

libcodechecker/analyze/analyzers/analyzer_types.py → analyzer/codechecker/analyze/analyzers/analyzer_types.py

@@ -15,12 +15,14 @@
 import re
 import subprocess
 
-from libcodechecker.analyze import host_check
-from libcodechecker.analyze.analyzers.analyzer_clang_tidy import ClangTidy
-from libcodechecker.analyze.analyzers.analyzer_clangsa import ClangSA
 from libcodechecker.env import get_check_env
 from libcodechecker.logger import get_logger
 
+from .. import host_check
+
+from .analyzer_clang_tidy import ClangTidy
+from .analyzer_clangsa import ClangSA
+
 LOG = get_logger('analyzer')
 
 supported_analyzers = {ClangSA.ANALYZER_NAME: ClangSA,

libcodechecker/analyze/analyzers/config_handler_clang_tidy.py → analyzer/codechecker/analyze/analyzers/config_handler_clang_tidy.py

@@ -15,9 +15,10 @@
 import re
 import shlex
 
-from libcodechecker.analyze.analyzers import config_handler
 from libcodechecker.logger import get_logger
 
+from . import config_handler
+
 LOG = get_logger('analyzer.tidy')
 
 

libcodechecker/analyze/analyzers/config_handler_clangsa.py → analyzer/codechecker/analyze/analyzers/config_handler_clangsa.py

@@ -13,9 +13,10 @@
 
 import re
 
-from libcodechecker.analyze.analyzers import config_handler
 from libcodechecker.logger import get_logger
 
+from . import config_handler
+
 LOG = get_logger('analyzer.clangsa')
 
 

libcodechecker/analyze/analyzers/ctu_triple_arch.py → analyzer/codechecker/analyze/analyzers/ctu_triple_arch.py

@@ -12,9 +12,9 @@
 
 import shlex
 
-from libcodechecker.analyze.analyzers import analyzer_base
-from libcodechecker.analyze.analyzer_env import\
-    extend_analyzer_cmd_with_resource_dir
+from ..analyzer_env import extend_analyzer_cmd_with_resource_dir
+
+from . import analyzer_base
 
 
 def get_compile_command(action, config, source='', output=''):

libcodechecker/analyze/analyzers/result_handler_clang_tidy.py → analyzer/codechecker/analyze/analyzers/result_handler_clang_tidy.py

@@ -11,11 +11,12 @@
 from __future__ import absolute_import
 
 from libcodechecker import report
-from libcodechecker.analyze import tidy_output_converter
-from libcodechecker.analyze.analyzers.result_handler_base \
-    import ResultHandler
 from libcodechecker.logger import get_logger
 
+from .. import tidy_output_converter
+
+from .result_handler_base import ResultHandler
+
 LOG = get_logger('report')
 
 

libcodechecker/analyze/analyzers/result_handler_clangsa.py → analyzer/codechecker/analyze/analyzers/result_handler_clangsa.py

@@ -11,10 +11,10 @@
 from __future__ import absolute_import
 
 from libcodechecker import report
-from libcodechecker.analyze.analyzers.result_handler_base \
-    import ResultHandler
 from libcodechecker.logger import get_logger
 
+from .result_handler_base import ResultHandler
+
 LOG = get_logger('report')
 
 

libcodechecker/analyze/ctu_manager.py → analyzer/codechecker/analyze/ctu_manager.py

@@ -15,10 +15,11 @@
 import shutil
 import tempfile
 
-from libcodechecker.analyze.analyzers import analyzer_base
-from libcodechecker.analyze.analyzers import ctu_triple_arch
 from libcodechecker.logger import get_logger
 
+from .analyzers import analyzer_base
+from .analyzers import ctu_triple_arch
+
 LOG = get_logger('analyzer')