summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2014-11-27 13:51:55 +0100
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2014-11-27 13:51:55 +0100
commitbce566d2cdc3979420ef70f22df221c83b75e832 (patch)
treefec37d885faeae050e8573012437ef88f6fda399
parentae73551800dd57cf7cd9973f08c61910353e804f (diff)
Use FUTURE_PARSER=yes instead of PUPPET_PARSER=future
-rw-r--r--.travis.yml4
-rw-r--r--spec/spec_helper.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 6c66f09..62ea8b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,10 @@ matrix:
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
- env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future"
+ env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
allow_failures:
- rvm: 2.0.0
- env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future"
+ env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
notifications:
email: false
deploy:
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9675ded..cf5db0b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -23,7 +23,7 @@ RSpec.configure do |c|
Puppet.settings[:strict_variables]=true
end
- if ENV['PUPPET_PARSER'] == 'future'
+ if ENV['FUTURE_PARSER'] == 'yes'
c.parser='future'
end
end