Merge pull request #281 from andrey-terekhov/llvm-testing

LLVM testing fix
andrey-terekhov · Mar 9, 2022 · 1968d97 · 1968d97
2 parents 71a75e2 + e159265
commit 1968d97
Show file tree

Hide file tree

Showing 14 changed files with 174 additions and 134 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -75,8 +75,6 @@ jobs:
     name: macOS
     runs-on: macos-latest
     steps:
-      - name: Set up environment
-        run: brew install coreutils
       - name: GitHub repository checkout
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
@@ -0,0 +1,48 @@
+name: Test on LLVM
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  windows:
+    name: Windows Server 2019
+    runs-on: windows-2019
+    steps:
+      - name: GitHub repository checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Run script
+        shell: bash
+        run: |
+          patch ./scripts/test.sh < ./scripts/llvm.patch
+          ./scripts/test.sh
+
+  ubuntu:
+    name: Ubuntu 20.04
+    runs-on: ubuntu-20.04
+    steps:
+      - name: GitHub repository checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Run script
+        run: |
+          patch ./scripts/test.sh < ./scripts/llvm.patch
+          ./scripts/test.sh
+
+  macos:
+    name: macOS Big Sur 11
+    runs-on: macos-11
+    steps:
+      - name: GitHub repository checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up environment
+        run: brew install coreutils
+      - name: Run script
+        run: |
+          patch ./scripts/test.sh < ./scripts/llvm.patch
+          ./scripts/test.sh
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
diff --git a/.github/workflows/virtual.yml b/.github/workflows/virtual.yml
@@ -0,0 +1,42 @@
+name: Test on Virtual machine
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  windows:
+    name: Windows Server 2019
+    runs-on: windows-2019
+    steps:
+      - name: GitHub repository checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Run script
+        shell: bash
+        run: ./scripts/test.sh
+
+  ubuntu:
+    name: Ubuntu 20.04
+    runs-on: ubuntu-20.04
+    steps:
+      - name: GitHub repository checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Run script
+        run: ./scripts/test.sh
+
+  macos:
+    name: macOS Big Sur 11
+    runs-on: macos-11
+    steps:
+      - name: GitHub repository checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up environment
+        run: brew install coreutils
+      - name: Run script
+        run: ./scripts/test.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -15,14 +15,23 @@ virtual:
   script:
     - ./scripts/test.sh
 
+llvm-intel:
+  stage: llvm
+  before_script:
+    - apt-get update
+    - apt-get install -y build-essential cmake clang-11 gcc-mipsel-linux-gnu
+  script:
+    - patch ./scripts/test.sh < ./scripts/llvm.patch
+    - ./scripts/test.sh
+
 llvm-baikal:
   stage: llvm
   before_script:
     - apt-get update
     - apt-get install -y build-essential cmake clang-11 gcc-mipsel-linux-gnu sshpass
   script:
     - patch ./scripts/test.sh < ./scripts/llvm-baikal.patch
-    - ./scripts/test.sh
+    - ./scripts/test.sh -d
 
 llvm-uemu:
   stage: llvm
@@ -32,4 +41,4 @@ llvm-uemu:
     - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.softcom.su/ruc/uemu ../uemu
   script:
     - patch ./scripts/test.sh < ./scripts/llvm-uemu.patch
-    - ./scripts/test.sh
+    - ./scripts/test.sh -d
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 
-if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+if(MSVC)
 	# Starting in Visual Studio 2019 version 16.8, you may specify /std:c11
 	add_compile_options(/W4 /WX /wd4204 /wd4221 /wd5105 /utf-8
 						"$<$<VERSION_GREATER_EQUAL:MSVC_VERSION,1928>:/std:c11>"
@@ -39,6 +39,12 @@ endif()
 add_compile_definitions("$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
 
 
+# Import testing exit code
+if(DEFINED TESTING_EXIT_CODE)
+	add_compile_definitions(TESTING_EXIT_CODE=${TESTING_EXIT_CODE})
+endif()
+
+
 # Add libraries
 add_subdirectory(libs)
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Tests](https://github.com/andrey-terekhov/RuC/actions/workflows/tests.yml/badge.svg)](https://github.com/andrey-terekhov/RuC/actions/workflows/tests.yml)
+[![Virtual](https://github.com/andrey-terekhov/RuC/actions/workflows/virtual.yml/badge.svg)](https://github.com/andrey-terekhov/RuC/actions/workflows/virtual.yml) [![LLVM](https://github.com/andrey-terekhov/RuC/actions/workflows/virtual.yml/badge.svg)](https://github.com/andrey-terekhov/RuC/actions/workflows/virtual.yml)
 # ![Logo](https://raw.githubusercontent.com/Victor-Y-Fadeev/RuC-WPF/master/RuC.WPF/Images/Repository.png) Russian C
 
 Этот репозиторий содержит компилятор языка RuC.

diff --git a/libs/compiler/CMakeLists.txt b/libs/compiler/CMakeLists.txt
@@ -13,6 +13,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(${PROJECT_NAME} preprocessor utils)
 
-if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+if(NOT MSVC)
 	target_link_libraries(${PROJECT_NAME} m)
 endif()
diff --git a/scripts/llvm-baikal.patch b/scripts/llvm-baikal.patch
@@ -1,16 +1,25 @@
---- test.sh	2022-02-28 19:18:46.488161200 +0300
-+++ llvm.sh	2022-02-28 19:22:24.132779300 +0300
-@@ -3,7 +3,8 @@
+--- test.sh	2022-03-09 20:38:58.473520400 +0300
++++ llvm.sh	2022-03-09 20:40:27.502109200 +0300
+@@ -3,7 +3,9 @@
  init()
  {
  	exit_code=1
 -	vm_exec=export.txt
 +	vm_exec=export.ll
 +	llvm_exec=export
++
 
  	vm_release=master
  	output_time=0.0
-@@ -175,10 +176,6 @@
+@@ -22,6 +24,7 @@
+ 	subdir_error=errors
+ 	subdir_warning=warnings
+ 	subdir_include=include
++	subdir_no_llvm=no-llvm
+
+ 	while ! [[ -z $1 ]]
+ 	do
+@@ -185,10 +188,6 @@
  	else
  		compiler_debug=$compiler
  	fi
@@ -21,7 +30,7 @@
  }
 
  run()
-@@ -259,7 +256,8 @@
+@@ -269,7 +268,8 @@
  {
  	if [[ $path == $dir_exec/* ]] ; then
  		action="execution"
@@ -31,11 +40,14 @@
 
  		case $? in
  			0)
-@@ -350,7 +348,7 @@
+@@ -379,9 +379,9 @@
+ compiling()
  {
- 	if [[ -z $ignore || $path != $dir_error/* ]] ; then
+ 	if [[ -z $ignore || $path != $dir_lexing/* || $path != $dir_preprocessor/* || $path != $dir_semantics/* 
+-		|| $path != $dir_syntax/* || $path != $dir_multiple_errors/* || $path != $dir_unsorted/* ]] ; then
++		|| $path != $dir_syntax/* || $path != $dir_multiple_errors/* || $path != $dir_unsorted/* ]] && [[ $path != */$subdir_no_llvm/* ]] ; then
  		action="compiling"
--		run $compiler $compiler_debug $sources -o $vm_exec
+-		run $compiler $compiler_debug $sources -o $vm_exec -VM
 +		run $compiler $compiler_debug $sources -LLVM -o $vm_exec && clang-11 --target=mipsel-linux-gnu -static $vm_exec -lm -o $llvm_exec &>$log
 
  		case $? in

diff --git a/scripts/llvm-uemu.patch b/scripts/llvm-uemu.patch
@@ -1,16 +1,25 @@
---- test.sh	2022-02-28 19:18:46.488161200 +0300
-+++ llvm.sh	2022-02-28 19:23:37.950288100 +0300
-@@ -3,7 +3,8 @@
+--- test.sh	2022-03-09 20:38:58.473520400 +0300
++++ llvm.sh	2022-03-09 20:38:42.886707100 +0300
+@@ -3,7 +3,9 @@
  init()
  {
  	exit_code=1
 -	vm_exec=export.txt
 +	vm_exec=export.ll
 +	llvm_exec=export
++
 
  	vm_release=master
  	output_time=0.0
-@@ -175,10 +176,6 @@
+@@ -22,6 +24,7 @@
+ 	subdir_error=errors
+ 	subdir_warning=warnings
+ 	subdir_include=include
++	subdir_no_llvm=no-llvm
+
+ 	while ! [[ -z $1 ]]
+ 	do
+@@ -185,10 +188,6 @@
  	else
  		compiler_debug=$compiler
  	fi
@@ -21,7 +30,7 @@
  }
 
  run()
-@@ -259,7 +256,8 @@
+@@ -269,7 +268,8 @@
  {
  	if [[ $path == $dir_exec/* ]] ; then
  		action="execution"
@@ -31,11 +40,14 @@
 
  		case $? in
  			0)
-@@ -350,7 +348,7 @@
+@@ -379,9 +379,9 @@
+ compiling()
  {
- 	if [[ -z $ignore || $path != $dir_error/* ]] ; then
+ 	if [[ -z $ignore || $path != $dir_lexing/* || $path != $dir_preprocessor/* || $path != $dir_semantics/* 
+-		|| $path != $dir_syntax/* || $path != $dir_multiple_errors/* || $path != $dir_unsorted/* ]] ; then
++		|| $path != $dir_syntax/* || $path != $dir_multiple_errors/* || $path != $dir_unsorted/* ]] && [[ $path != */$subdir_no_llvm/* ]] ; then
  		action="compiling"
--		run $compiler $compiler_debug $sources -o $vm_exec
+-		run $compiler $compiler_debug $sources -o $vm_exec -VM
 +		run $compiler $compiler_debug $sources -LLVM -o $vm_exec && clang-11 --target=mipsel-linux-gnu -static $vm_exec -lm -o $llvm_exec &>$log
 
  		case $? in