Unverified Commit 817b8440 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1434 from sfackler/ctest2 

switch to ctest2
parents 7993bebe 49e6a54c

.circleci/config.yml

+20 −30
Original line number Diff line number Diff line
@@ -22,10 +22,7 @@ jobs: 
        default: false

      image:

        type: string

        default: 1.36.0

      minimal_build:

        type: boolean

        default: false

        default: 1.40.0

    docker:

      - image: rust:<< parameters.image >>

    environment:
@@ -118,10 +115,6 @@ jobs: 
      - restore_cache:

          key: registry

      - run: cargo generate-lockfile

      - when:

          condition: << parameters.minimal_build >>

          steps:

            - run: cargo update -p pkg-config --precise 0.3.14

      - save_cache:

          key: registry-{{ .BuildNum }}

          paths:
@@ -133,9 +126,6 @@ jobs: 
            --manifest-path=openssl/Cargo.toml \

            <<# parameters.vendored >>--features vendored<</ parameters.vendored >> \

            --target << parameters.target >>

      - unless:

          condition: << parameters.minimal_build >>

          steps:

      - run: |

          cargo run \

            --manifest-path=systest/Cargo.toml \
@@ -175,7 +165,7 @@ jobs: 
        default: false

      image:

        type: string

        default: 1.36.0

        default: 1.40.0

    macos:

      xcode: "12.2.0"

    environment:

systest/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ libc = "0.2" 
openssl-sys = { path = "../openssl-sys" }



[build-dependencies]

ctest = "0.2"

ctest2 = "0.4"



[features]

vendored = ['openssl-sys/vendored']

systest/build.rs

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ use std::env; 
mod cfgs;



fn main() {

    let mut cfg = ctest::TestGenerator::new();

    let mut cfg = ctest2::TestGenerator::new();

    let target = env::var("TARGET").unwrap();



    if let Ok(out) = env::var("DEP_OPENSSL_INCLUDE") {