vgvassilev · reikdas · Oct 15, 2020 · Dec 17, 2019 · Oct 16, 2020 · Oct 21, 2020
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,179 @@
+name: Cling CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+
+        include:
+          - name: ubuntu-16.04-gcc-4.8-compile
+            os: ubuntu-16.04
+            compiler: gcc
+            version: "4.8"
+
+          - name: ubuntu-16.04-gcc-5
+            os: ubuntu-16.04
+            compiler: gcc
+            version: "5"
+
+          - name: ubuntu-16.04-gcc-6
+            os: ubuntu-16.04
+            compiler: gcc
+            version: "6"
+
+          - name: ubuntu-16.04-gcc-7
+            os: ubuntu-16.04
+            compiler: gcc
+            version: "7"
+
+          - name: ubuntu-16.04-gcc-7-compile
+            os: ubuntu-16.04
+            compiler: gcc
+            version: "7"
+
+          - name: ubuntu-16.04-gcc-7-notar
+            os: ubuntu-16.04
+            compiler: gcc
+            version: "7"
+
+          - name: ubuntu-16.04-clang-3.9
+            os: ubuntu-16.04
+            compiler: clang
+            version: "3.9"
+
+          - name: ubuntu-16.04-clang-6
+            os: ubuntu-16.04
+            compiler: clang
+            version: "6.0"
+
+          - name: ubuntu-16.04-clang-6-compile
+            os: ubuntu-16.04
+            compiler: clang
+            version: "6.0"
+
+          - name: ubuntu-18.04-gcc-7-notar
+            os: ubuntu-18.04
+            compiler: gcc
+            version: "7"
+
+          - name: ubuntu-18.04-gcc-7-compile
+            os: ubuntu-18.04
+            compiler: gcc
+            version: "7"
+
+          - name: ubuntu-18.04-clang-7-notar
+            os: ubuntu-18.04
+            compiler: clang
+            version: "7"
+
+          - name: macos-xcode-11.2.1
+            os: macOS-latest
+            compiler: clang
+            xcode-version: "11.2.1"
+
+          - name: macos-xcode-11.2.1-compile
+            os: macOS-latest
+            compiler: clang
+            xcode-version: "11.2.1"
+
+      #    - name: macos-xcode-11.2.1-notar
+      #      os: macOS-latest
+      #      compiler: clang
+      #      xcode-version: "11.2.1"
+
+          - name: macos-gcc-9-compile
+            os: macOS-latest
+            compiler: gcc
+            version: "9"
+
+          - name: ubuntu-20.04-clang-7-compile
+            os: ubuntu-20.04
+            compiler: clang
+            version: "7"
+
+          - name: ubuntu-20.04-gcc-7-compile
+            os: ubuntu-20.04
+            compiler: gcc
+            version: "7"
+
+          - name: windows-2019-ninja
+            os: windows-2019
+            generator: Ninja
+
+          - name: windows-2019-visual-studio
+            os: windows-2019
+            generator: Visual Studio 16 2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup compiler on Linux
+      run: |
+        sudo apt-get update
+        if [ "${{ matrix.compiler }}" = "gcc" ]; then
+          sudo apt-get install -y gcc-${{ matrix.version }} g++-${{ matrix.version }}
+          echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV
+          echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
+        else
+          sudo apt-get install -y clang-${{ matrix.version }}
+          echo "CC=clang-${{ matrix.version }}" >> $GITHUB_ENV
+          echo "CXX=clang++-${{ matrix.version }}" >> $GITHUB_ENV
+        fi
+      if: runner.os == 'Linux'
+      shell: bash
+    - name: Setup compiler on OS X
+      run: |
+        curl -LO https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci; source ./macports-ci install
+        if [ "${{ matrix.compiler }}" = "gcc" ]; then
+          brew install gcc@${{ matrix.version }}
+          echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV
+          echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
+        else
+          sudo xcode-select -switch /Applications/Xcode_${{ matrix.xcode-version }}.app
+          echo "CC=clang" >> $GITHUB_ENV
+          echo "CXX=clang++" >> $GITHUB_ENV
+        fi
+      if: runner.os == 'macOS'
+    - name: Setup ninja for Windows
+      uses: seanmiddleditch/gha-setup-ninja@master
+      if: runner.os == 'Windows' && matrix.generator == 'Ninja'
+    - name: Execute cpt on Linux/OS X
+      run: |
+        if [[ "${{ matrix.compiler }}" = "gcc" && "${{ matrix.version }}" = "7" ]]; then
+          export CLING_BUILD_FLAGS="-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON"
+          if [ "${{ matrix.os }}" != "macOS-latest" ]; then
+            export CLING_BUILD_FLAGS="$CLING_BUILD_FLAGS -DCXX_EXTENSIONS=OFF"
+          fi
+        fi
+        export CLING_BUILD_FLAGS="$CLING_BUILD_FLAGS -DCLANG_ENABLE_ARCMT=OFF -DCLANG_ENABLE_STATIC_ANALYZER=OFF -DLLVM_ENABLE_WARNINGS=OFF -DCLING_ENABLE_WARNINGS=ON"
+        if [[ ${{ matrix.name }} == *"compile"* ]]; then
+          ./cpt.py -y --check-requirements --current-dev=tar --with-cmake-flags="$CLING_BUILD_FLAGS" --with-cling-url=https://github.com/$GITHUB_REPOSITORY --cling-branch=${{ github.head_ref }}
+        elif [[ ${{ matrix.name }} == *"notar"* ]]; then
+          ./cpt.py -y --check-requirements --current-dev=tar --with-cmake-flags="$CLING_BUILD_FLAGS" --with-cling-url=https://github.com/$GITHUB_REPOSITORY --cling-branch=${{ github.head_ref }} --with-binary-llvm
+        else
+          ./cpt.py -y --check-requirements --current-dev=tar --with-cmake-flags="$CLING_BUILD_FLAGS" --with-cling-url=https://github.com/$GITHUB_REPOSITORY --cling-branch=${{ github.head_ref }} --with-binary-llvm --with-llvm-tar
+        fi
+      working-directory: tools/packaging/
+      if: runner.os != 'Windows'
+    - name: Start SSH session
+      uses: luchihoratiu/debug-via-ssh@main
+      with:
+        NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
+        SSH_PASS: ${{ secrets.SSH_PASS }}
+    - name: Execute cpt on Windows
+      run: |
+        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\vc\Auxiliary\build\vcvarsall.bat" x64
+        C:\hostedtoolcache\windows\Python\3.7.9\x64\python.exe cpt.py --current-dev=tar --with-cmake-flags="-DLLVM_OPTIMIZED_TABLEGEN=ON -DCLING_BUILD_PLUGINS=Off -DCMAKE_C_COMPILER=\"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.27.29110\bin\Hostx64\x64\cl.exe\" -DCMAKE_CXX_COMPILER=\"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.27.29110\bin\Hostx64\x64\cl.exe\" -G \"${{ matrix.generator}}\"" --with-cling-url=https://github.com/%GITHUB_REPOSITORY% --cling-branch=${{ github.head_ref }} --skip-cleanup
+      working-directory: tools\packaging\
+      shell: cmd
+      if: runner.os == 'Windows'
diff --git a/appveyor.yml b/appveyor.yml
@@ -53,8 +53,7 @@ build_script:
   - tools\packaging\cpt.py ^
         --current-dev=tar ^
         --with-cling-url=https://github.com/%APPVEYOR_REPO_NAME% ^
-        --with-clang-url=http://root.cern.ch/git/clang.git ^
-        --with-llvm-url=http://root.cern.ch/git/llvm.git ^
+        --cling-branch=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH% ^
         --with-cmake-flags="-DLLVM_OPTIMIZED_TABLEGEN=ON -G\"%CMAKE_GEN%\"" ^
         --skip-cleanup
 

diff --git a/test/Autoloading/AutoForwarding.C b/test/Autoloading/AutoForwarding.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -I%S -Xclang -verify
+// RUN: %cling -I%S -Xclang -verify < %s
 // XFAIL: vanilla-cling
 // Test FwdPrinterTest
 

diff --git a/test/CodeGeneration/Statics.C b/test/CodeGeneration/Statics.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cling -Xclang -verify 2>&1 < %s | FileCheck %s
 
 #include <stdio.h>
 

diff --git a/test/CodeUnloading/AtExit.C b/test/CodeUnloading/AtExit.C
@@ -6,8 +6,8 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify 2>&1 | FileCheck %s
-// FIXME: cat %s | %cling -fsyntax-only -Xclang -verify 2>&1
+// RUN: %cling -Xclang -verify 2>&1 < %s | FileCheck %s
+// FIXME: %cling -fsyntax-only -Xclang -verify 2>&1 < %s
 
 // Test to check functions registered via atexit are intercepted, and __dso_handle
 // is properly overridden in for child interpreters.

diff --git a/test/Interfaces/evaluate.C b/test/Interfaces/evaluate.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify | FileCheck %s
+// RUN: %cling -Xclang -verify < %s | FileCheck %s
 
 #include "cling/Interpreter/Interpreter.h"
 #include "cling/Interpreter/Value.h"

diff --git a/test/Interfaces/transactionReuse.C b/test/Interfaces/transactionReuse.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %built_cling -fno-rtti | FileCheck %s
+// RUN: %built_cling -fno-rtti < %s | FileCheck %s
 
 // This test makes sure the interpreter doesn't create many useless empty
 // transactions.

diff --git a/test/Lookup/data.C b/test/Lookup/data.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test lookupData
 
 .rawInput 1

diff --git a/test/Lookup/named.C b/test/Lookup/named.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test Lookup::Named and Namespace, used in quick simple lookups.
 
 #include "cling/Interpreter/Interpreter.h"

diff --git a/test/Lookup/scope.C b/test/Lookup/scope.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test findScope, which is essentially is a DeclContext.
 #include "cling/Interpreter/Interpreter.h"
 #include "cling/Interpreter/LookupHelper.h"

diff --git a/test/Lookup/tag.C b/test/Lookup/tag.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test Lookup::Named and Namespace, used in quick simple lookups.
 
 #include "cling/Interpreter/Interpreter.h"

diff --git a/test/Lookup/template.C b/test/Lookup/template.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %built_cling -fno-rtti 2>&1 | FileCheck %s
+// RUN: %built_cling -fno-rtti 2>&1 < %s | FileCheck %s
 // Test findClassTemplate, which is esentially is a DeclContext.
 #include "cling/Interpreter/Interpreter.h"
 #include "cling/Interpreter/LookupHelper.h"

diff --git a/test/NullDeref/BinOp.C b/test/NullDeref/BinOp.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks a pointer load operation for null prt dereference.
 int *p = 0;

diff --git a/test/NullDeref/Cast.C b/test/NullDeref/Cast.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks a pointer load operation for null prt dereference.
 int *p = 0;;

diff --git a/test/NullDeref/ExecutionTermination.C b/test/NullDeref/ExecutionTermination.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks that the execution ends after a null prt dereference.
 

diff --git a/test/NullDeref/InvalidMemoryAddress.C b/test/NullDeref/InvalidMemoryAddress.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks a dereference of an invalid memory address pointer..
 int *p = (int*)0x1;

diff --git a/test/NullDeref/Load.C b/test/NullDeref/Load.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 //This file checks a pointer load operation for null prt dereference.
 int *p;

diff --git a/test/NullDeref/MethodCalls.C b/test/NullDeref/MethodCalls.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 // This test verifies that we get nice warning if a method on null ptr object is
 // called.

diff --git a/test/NullDeref/NonNullArg.C b/test/NullDeref/NonNullArg.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify | FileCheck %s
+// RUN: %cling -Xclang -verify < %s | FileCheck %s
 // XFAIL: powerpc64
 //This file checks a call instruction. The called function has arguments with nonnull attribute.
 extern "C" int printf(const char* fmt, ...);

diff --git a/test/NullDeref/NonNullArgCustom.C b/test/NullDeref/NonNullArgCustom.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling -Xclang -verify
+// RUN: %cling -Xclang -verify < %s
 // XFAIL: powerpc64
 
 // We must be able to handle cases where, there is a custom function that has

diff --git a/test/Plugins/Simple.C b/test/Plugins/Simple.C
@@ -1,4 +1,4 @@
-// RUN: cat %s | %cling -fplugin=%cling_obj_root/tools/plugins/example/libclingDemoPlugin%shlibext | FileCheck %s
+// RUN: %cling -fplugin=%cling_obj_root/tools/plugins/example/libclingDemoPlugin%shlibext < %s | FileCheck %s
 
 // CHECK:Action::ParseArgs
 // CHECK-NEXT:Action::CreateASTConsumer

diff --git a/test/Prompt/ValuePrinter/Regression.C b/test/Prompt/ValuePrinter/Regression.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %cling 2>&1 | FileCheck %s
+// RUN: %cling 2>&1 < %s | FileCheck %s
 
 // This file should be used as regression test for the value printing subsystem
 // Reproducers of fixed bugs should be put here

diff --git a/test/Prompt/ValuePrinter/Strings.C b/test/Prompt/ValuePrinter/Strings.C
@@ -7,7 +7,7 @@
 //------------------------------------------------------------------------------
 
 // Windows wants -Wno-deprecated-declarations
-//RUN: cat %s | %cling -Wno-deprecated-declarations -Xclang -verify 2>&1 | FileCheck %s
+//RUN: %cling -Wno-deprecated-declarations -Xclang -verify 2>&1 < %s | FileCheck %s
 
 #include <stdlib.h>
 #ifdef _WIN32

diff --git a/test/Utils/Transform.C b/test/Utils/Transform.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// RUN: cat %s | %built_cling -fno-rtti | FileCheck %s
+// RUN: %built_cling -fno-rtti < %s | FileCheck %s
 
 // The test verifies the expected behavior in cling::utils::Transform class,
 // which is supposed to provide different transformation of AST nodes and types.

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -14,4 +14,6 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../lib/UserInterface/textinput
   add_subdirectory(demo)
 endif()
 
-add_subdirectory(plugins)
+if (LLVM_ENABLE_PLUGINS)
+  add_subdirectory(plugins)
+endif()