Magnus pushed to branch wip/mangoiv/ci-stages at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • .gitlab/ci.sh
    ... ... @@ -735,16 +735,16 @@ function test_hadrian() {
    735 735
         local test_compiler="$instdir/bin/${cross_prefix}ghc$exe"
    
    736 736
         install_bindist $dist_dir/ghc-*/ "$instdir"
    
    737 737
     
    
    738
    -    if [[ "${CI_JOB_NAME}" != *"windows"* ]] && [ -z "${CROSS_TARGET:-}" ]
    
    739
    -    then
    
    740
    -      run_hadrian \
    
    741
    -        test \
    
    742
    -        --test-root-dirs=testsuite/tests/stage1 \
    
    743
    -        --test-compiler=stage1 \
    
    744
    -        ${TEST_WAYS[@]/#/--test-way=} \
    
    745
    -        "runtest.opts+=${RUNTEST_ARGS:-}" || fail "hadrian stage1 test"
    
    746
    -      info "STAGE1_TEST=$?"
    
    747
    -    fi
    
    738
    +    # if [[ "${CI_JOB_NAME}" != *"windows"* ]] && [ -z "${CROSS_TARGET:-}" ]
    
    739
    +    # then
    
    740
    +    #   run_hadrian \
    
    741
    +    #     test \
    
    742
    +    #     --test-root-dirs=testsuite/tests/stage1 \
    
    743
    +    #     --test-compiler=stage1 \
    
    744
    +    #     ${TEST_WAYS[@]/#/--test-way=} \
    
    745
    +    #     "runtest.opts+=${RUNTEST_ARGS:-}" || fail "hadrian stage1 test"
    
    746
    +    #   info "STAGE1_TEST=$?"
    
    747
    +    # fi
    
    748 748
     
    
    749 749
         # Ensure the resulting compiler has the correct bignum-flavour,
    
    750 750
         # except for cross-compilers as they may not support the interpreter