CPAN Release 0.44

- Fixd issue/4, proper ONLY handling
ingydotnet · Aug 13, 2014 · 4f25fed · 4f25fed
1 parent 346cb0a
commit 4f25fed
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,9 @@
 ---
+version: 0.44
+date:    Wed Aug 13 16:27:24 PDT 2014
+changes:
+- Fixd issue/4, proper ONLY handling
+---
 version: 0.43
 date:    Sat Aug  9 00:25:05 PDT 2014
 changes:

diff --git a/Makefile b/Makefile
@@ -38,6 +38,9 @@ help:
 	@echo 'Makefile targets:'
 	@echo ''
 	@echo '    make test      - Run the repo tests'
+	@echo '    make test-dev  - Run the developer only tests'
+	@echo '    make test-all  - Run all tests'
+	@echo ''
 	@echo '    make install   - Install the dist from this repo'
 	@echo '    make prereqs   - Install the CPAN prereqs'
 	@echo '    make update    - Update generated files'
@@ -68,6 +71,13 @@ else
 	@echo "Testing not available. Use 'disttest' instead."
 endif
 
+test-dev:
+ifneq ($(wildcard test/devel),)
+	$(PERL) -S prove -lv test/devel
+endif
+
+test-all: test test-dev
+
 install: distdir
 	@echo '***** Installing $(DISTDIR)'
 	(cd $(DISTDIR); perl Makefile.PL; make install)
@@ -86,7 +96,7 @@ release:
 	make update
 	make check-release
 	make date
-	make test
+	make test-all
 	make disttest
 	@echo '***** Releasing $(DISTDIR)'
 	make dist

diff --git a/Meta b/Meta
@@ -1,7 +1,7 @@
 =meta: 0.0.1
 
 name: TestML
-version: 0.43
+version: 0.44
 abstract: A Generic Software Testing Meta Language
 homepage: http://testml.org
 

diff --git a/lib/TestML.pm b/lib/TestML.pm
@@ -1,7 +1,7 @@
 package TestML;
 
 use TestML::Base;
-our $VERSION = '0.43';
+our $VERSION = '0.44';
 
 has runtime => ();
 has compiler => ();

diff --git a/lib/TestML/Runtime.pm b/lib/TestML/Runtime.pm
@@ -202,13 +202,16 @@ sub select_blocks {
     OUTER: for my $block (@{$self->function->data}) {
         my %points = %{$block->points};
         next if exists $points{SKIP};
-        for my $point (@$wanted) {
-            next OUTER unless exists $points{$point};
-        }
         if (exists $points{ONLY}) {
+            for my $point (@$wanted) {
+                return [] unless exists $points{$point};
+            }
             $selected = [$block];
             last;
         }
+        for my $point (@$wanted) {
+            next OUTER unless exists $points{$point};
+        }
         push @$selected, $block;
         last if exists $points{LAST};
     }