From 91a63d55eb92ef0bcb141b6c094a28ef026eaf16 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Wed, 15 Aug 2018 09:43:40 -0400
Subject: [PATCH] add tests for pkg-config failure scenario

due to conflicting gcc CFLAGS, details in #1772 and #1731.

added to both master and PR pipelines.
---
 concourse/nokogiri.yml           | 53 ++++++++++++++++++++++++++++++++
 concourse/tasks/rake-test/run.sh | 27 +++++++++-------
 2 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/concourse/nokogiri.yml b/concourse/nokogiri.yml
index 6bad9c3cde..f0c65067a7 100644
--- a/concourse/nokogiri.yml
+++ b/concourse/nokogiri.yml
@@ -6,6 +6,7 @@ groups:
       - "ruby-<%= ruby_version %>-vendored"
       - "ruby-<%= ruby_version %>-valgrind"
       <% end %>
+      - "ruby-vanilla-system"
       <% for ruby_version in RUBIES[:mri].last(1) %>
       - "ruby-libxmlruby-system"
       - "ruby-libxmlruby-vendored"
@@ -33,6 +34,7 @@ groups:
       - ruby-<%= RUBIES[:mri].last %>-system-pr
       - ruby-<%= RUBIES[:mri].last %>-vendored-pr
       - ruby-<%= RUBIES[:mri].last %>-valgrind-pr
+      - ruby-vanilla-system-pr
       - jruby-<%= RUBIES[:jruby].last %>-pr
       - rbx-<%= RUBIES[:rbx].last %>-pr
       - pr-success
@@ -162,6 +164,29 @@ jobs:
   <% end %>
 
 % ruby_version = RUBIES[:mri].last
+  - name: ruby-vanilla-system
+    public: true
+    plan:
+      - get: ci
+      - get: nokogiri
+        trigger: true
+        passed: ["ruby-<%= ruby_version %>-system"]
+      - task: rake-test
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: {repository: ubuntu, tag: xenial}
+          inputs:
+            - name: ci
+            - name: nokogiri
+          params:
+            NOKOGIRI_USE_SYSTEM_LIBRARIES: t
+            TEST_WITH_APT_REPO_RUBY: t
+          run:
+            path: ci/concourse/tasks/rake-test/run.sh
+        on_failure: *notify_failure_to_irc
+
   - name: ruby-libxmlruby-system
     public: true
     plan:
@@ -433,6 +458,33 @@ jobs:
         on_failure: { aggregate: [*notify_failure_to_irc, *notify_failure_to_pr] }
   <% end %>
 
+% ruby_version = RUBIES[:mri].last
+  - name: ruby-vanilla-system-pr
+    public: true
+    max_in_flight: 1
+    plan:
+      - get: ci
+      - get: nokogiri-pr
+        trigger: true
+        version: every
+        passed: ["ruby-<%= ruby_version %>-system-pr"]
+      - task: rake-test
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: {repository: ubuntu, tag: xenial}
+          inputs:
+            - name: ci
+            - name: nokogiri-pr
+              path: nokogiri
+          params:
+            NOKOGIRI_USE_SYSTEM_LIBRARIES: t
+            TEST_WITH_APT_REPO_RUBY: t
+          run:
+            path: ci/concourse/tasks/rake-test/run.sh
+        on_failure: { aggregate: [*notify_failure_to_irc, *notify_failure_to_pr] }
+
 % jruby_version = RUBIES[:jruby].last
   - name: jruby-<%= jruby_version %>-pr
     public: true
@@ -501,6 +553,7 @@ jobs:
           - ruby-<%= RUBIES[:mri].last %>-system-pr
           - ruby-<%= RUBIES[:mri].last %>-vendored-pr
           - ruby-<%= RUBIES[:mri].last %>-valgrind-pr
+          - ruby-vanilla-system-pr
           - jruby-<%= RUBIES[:jruby].last %>-pr
           - rbx-<%= RUBIES[:rbx].last %>-pr
       - put: nokogiri-pr
diff --git a/concourse/tasks/rake-test/run.sh b/concourse/tasks/rake-test/run.sh
index f6ef466f09..d4db0e9c5a 100755
--- a/concourse/tasks/rake-test/run.sh
+++ b/concourse/tasks/rake-test/run.sh
@@ -2,12 +2,26 @@
 
 set -e -x -u
 
+APT_UPDATED=false
+
+function ensure-apt-update {
+  if [[ $APT_UPDATED != "false" ]] ; then
+    return
+  fi
+
+  apt-get update
+  APT_UPDATED=true
+}
+
+if [[ ${TEST_WITH_APT_REPO_RUBY:-} != "" ]] ; then
+  ensure-apt-update
+  apt-get install -y ruby ruby-dev bundler libxslt-dev libxml2-dev pkg-config
+fi
+
 VERSION_INFO=$(ruby -v)
 RUBY_ENGINE=$(cut -d" " -f1 <<< "${VERSION_INFO}")
 RUBY_VERSION=$(cut -d" " -f2 <<< "${VERSION_INFO}")
 
-APT_UPDATED=false
-
 FROZEN_STRING_REF="53f9b66"
 
 function mri-24-or-greater {
@@ -36,15 +50,6 @@ function rbx-engine {
   return 1
 }
 
-function ensure-apt-update {
-  if [[ $APT_UPDATED != "false" ]] ; then
-    return
-  fi
-
-  apt-get update
-  APT_UPDATED=true
-}
-
 pushd nokogiri
 
   if rbx-engine ; then