Skip to content

Commit

Permalink
Merge pull request #2386 from AriaXLi/PA-5654/validate_vendored_ruby_aix
Browse files Browse the repository at this point in the history
(PA-5654) Remove warnflags from rbconfig.rb on AIX
  • Loading branch information
joshcooper authored Aug 15, 2023
2 parents d4a41cf + 897b876 commit 75cd90a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions acceptance/tests/validate_vendored_ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
require 'puppet/acceptance/temp_file_utils'
extend Puppet::Acceptance::CommandUtils

confine :except, :platform => 'aix-7.2-power' # PA-5654

def package_installer(agent)
# for some reason, beaker does not have a configured package installer
# for AIX so we manually set up the package installer for it.
Expand All @@ -27,6 +25,9 @@ def setup_build_environment(agent)

case agent['platform']
when /aix/
# sed on AIX does not support in place edits or delete
on(agent, "sed '/\"warnflags\"/d' /opt/puppetlabs/puppet/lib/ruby/3.2.0/powerpc-aix7.2.0.0/rbconfig.rb > no_warnflags_rbconfig.rb")
on(agent, "cp no_warnflags_rbconfig.rb /opt/puppetlabs/puppet/lib/ruby/3.2.0/powerpc-aix7.2.0.0/rbconfig.rb")
# use pl-build-tools' gcc on AIX machines
gem_install_sqlite3 = "export PATH=\"/opt/pl-build-tools/bin:$PATH\" && #{gem_install_sqlite3}"
when /solaris-11(.4|)-i386/
Expand Down

0 comments on commit 75cd90a

Please sign in to comment.