Merge pull request #27 from isuruf/test

Test

Author: isuruf

.appveyor.yml

@@ -1,11 +1,14 @@
-environment:
-  CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
-
 branches:
   only:
     - master
     - windows
 
+environment:
+  global:
+    MSYS2_ROOT: C:\msys64
+    CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
+    PYTHON2_LOCN: C:\\Python27-x64
+
 platform:
   - x64
 
@@ -18,15 +21,17 @@ install:
   - cmd: conda config --add channels conda-forge
   - cmd: conda config --add channels isuruf/label/flang
   - cmd: conda install --yes --quiet clangdev openmp cmake
-
+  - cmd: set "PATH=%PYTHON2_LOCN%\Scripts;%PYTHON2_LOCN%;%PATH%"
+  - cmd: appveyor DownloadFile "https://raw.githubusercontent.com/isuruf/flang/utils/llvm_utils_for_flang.zip" -FileName "utils.zip"
+  - cmd: 7z x -oC:\llvm_src utils.zip
 
 build_script:
   - mkdir build
   - cd build
   - set "PATH=%cd%\bin;%PATH%"
   - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
   - ps: |
-      cmake -G "NMake Makefiles" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release ..
+      cmake -G "NMake Makefiles" -DFLANG_INCLUDE_TESTS=ON -DFLANG_TEST_VERBOSE_MODE=ON -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DLLVM_INCLUDE_TESTS=ON -DLLVM_MAIN_SRC_DIR=C:\llvm_src ..
       Push-AppveyorArtifact .\CMakeFiles\CMakeOutput.log
       Push-AppveyorArtifact .\CMakeFiles\CMakeError.log
   - ps: |
@@ -39,3 +44,12 @@ build_script:
   - ps: Compress-Archive -Path C:\projects\flang\build\lib -DestinationPath C:\Projects\flang\lib.zip
   - ps: Push-AppveyorArtifact C:\Projects\flang\lib.zip
 
+test_script:
+  - cmd: set "PATH=%MSYS2_ROOT%\usr\bin\;%PATH%"
+  - cmd: copy lib\flangmain.lib %CONDA_INSTALL_LOCN%\Library\lib
+  - cmd: copy lib\flangrti.lib %CONDA_INSTALL_LOCN%\Library\lib
+  - cmd: copy lib\flang.lib %CONDA_INSTALL_LOCN%\Library\lib
+  - cmd: copy lib\ompstub.lib %CONDA_INSTALL_LOCN%\Library\lib
+  - cmd: nmake FileCheck
+  - cmd: copy bin\FileCheck.exe binFileCheck.exe
+  #- cmd: nmake check-flang

test/CMakeLists.txt

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+message(STATUS "Building test suite")
 
 # Test runner infrastructure for Flang. This configures the Flang test trees
 # for use by Lit, and delegates to LLVM's lit test handlers.
@@ -41,6 +42,11 @@ if(FLANG_TEST_USE_VG)
   set(FLANG_TEST_EXTRA_ARGS ${FLANG_TEST_EXTRA_ARGS} "--vg")
 endif ()
 
+option(FLANG_TEST_VERBOSE_MODE "Run Flang tests in verbose mode" OFF)
+if(FLANG_TEST_VERBOSE_MODE)
+  set(FLANG_TEST_EXTRA_ARGS ${FLANG_TEST_EXTRA_ARGS} "-vv --debug")
+endif ()
+
 set(FLANG_TEST_PARAMS
   flang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
   )

test/lit.cfg

@@ -26,10 +26,6 @@ import tempfile
 import lit.formats
 import lit.util
 
-if platform.system() == 'Windows':
-    lit_config.note('We do not support Windows, but hey, congratulations on porting to Windows!')
-    raise SystemExit
-
 # Configuration file for the 'lit' test runner.
 
 # name: The name of this test suite.
@@ -44,7 +40,7 @@ if use_lit_shell:
 else:
     # Otherwise we default to internal on Windows and external elsewhere, as
     # bash on Windows is usually very slow.
-    execute_external = (not sys.platform in ['win32'])
+    execute_external = True #(not sys.platform in ['win32'])
 
 # testFormat: The test format to use to interpret tests.
 #