From 63596227acb2ad66a546df34f9bd865093e352bc Mon Sep 17 00:00:00 2001
From: Ulrik Haugen <qha@lysator.liu.se>
Date: Thu, 12 Feb 2015 01:38:40 +0100
Subject: [PATCH] modules/Makefile: use puppet-extra-args variable in puppet
 apply calls.

This is to enable for instance testing with parser future without
setting that in puppet.conf which might accidentally be committed.
---
 modules/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/Makefile b/modules/Makefile
index bdebf85..33581ed 100755
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -2,7 +2,7 @@
 # -*- coding: utf-8; indent-tabs-mode: t; -*-
 
 # Make instructions for smoke testing Puppet manifests.
-# Copyright 2013 - 2014 Ulrik Haugen
+# Copyright 2013 - 2015 Ulrik Haugen
 # Copyright 2013 - 2014 Linköpings universitet
 
 # This program is free software: you can redistribute it and/or modify
@@ -198,6 +198,7 @@ puppet-dirs := --confdir smoke-testing-state/etc \
 	cat $< >$@
 	env `cat smoke-testing-state/share/global.testenv` `cat $<` \
 		$(fakeroot) puppet apply --noop \
+		$(puppet-extra-args) \
 		$(puppet-dirs) --verbose --color no \
 		--modulepath . $(basename $*).pp >>$@ 2>&1 \
 	    || (cat $@; false)
@@ -206,6 +207,7 @@ puppet-dirs := --confdir smoke-testing-state/etc \
 %.testoutput: %.pp smoke-testing-state/share/global.testenv smoke-testing-state/etc/puppet.conf smoke-testing-state/var/lib/puppet smoke-testing-state/var/run FORCE
 	env `cat smoke-testing-state/share/global.testenv` \
 		$(fakeroot) puppet apply --noop \
+		$(puppet-extra-args) \
 		$(puppet-dirs) --verbose --color no \
 		--modulepath . $< >$@ 2>&1 \
 	|| (cat $@; false)
-- 
GitLab