Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22853886 ruby/gem specs and tests should be faceted out via default transforms
authorShawn Ferry <shawn.ferry@oracle.com>
Wed, 30 Mar 2016 12:56:49 -0400
changeset 5747 4441137c3e4a
parent 5746 ffb1e5dafbd6
child 5748 e80cda8309df
22853886 ruby/gem specs and tests should be faceted out via default transforms
components/ruby/puppet/puppet.p5m file | annotate | diff | comparison | revisions
make-rules/ips.mk file | annotate | diff | comparison | revisions
transforms/puppet file | annotate | diff | comparison | revisions
transforms/ruby-tests file | annotate | diff | comparison | revisions 
--- a/components/ruby/puppet/puppet.p5m	Wed Mar 30 13:45:50 2016 -0400
+++ b/components/ruby/puppet/puppet.p5m	Wed Mar 30 12:56:49 2016 -0400
@@ -401,8 +401,12 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/Rakefile
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/metadata.json.erb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/spec/classes/init_spec.rb.erb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb
+file \
+    path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/spec/classes/init_spec.rb.erb \
+    facet.optional.test=true
+file \
+    path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb \
+    facet.optional.test=true
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/tar.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/tar/gnu.rb
--- a/make-rules/ips.mk	Wed Mar 30 13:45:50 2016 -0400
+++ b/make-rules/ips.mk	Wed Mar 30 12:56:49 2016 -0400
@@ -89,6 +89,8 @@
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/python-3-groups
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/python-3-soabi
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/python-3-no-32bit
+PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/ruby-tests
+PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/puppet
 PUBLISH_TRANSFORMS +=	$(PKGMOGRIFY_TRANSFORMS)
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/incorporate
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/publish-cleanup
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/transforms/puppet	Wed Mar 30 12:56:49 2016 -0400
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# Puppet module spec and tests files
+<transform file path=etc/puppet/modules/.*(spec|tests)/.* -> \
+    default facet.optional.test false>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/transforms/ruby-tests	Wed Mar 30 12:56:49 2016 -0400
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# Standard location for Ruby spec files
+<transform file path=usr/ruby/.*/lib/ruby/vendor_ruby/.*/spec/.* -> \
+    default facet.optional.test false>
+
+# Remove facet.optional.test from files explicitly marked with
+# facet.optional.test=true
+<transform file path=usr/ruby/.*/lib/ruby/vendor_ruby/.*/spec/.* -> \
+    delete facet.optional.test true>
upstream/oracle/userland-gate