Ensure that test_suite.pt only tries to build controllers which have Makefiles. (#6666)

Switching between master and develop branches can result in controller directories sticking around that only contain the results of a build on the previous branch. test_suite.py was trying (and failing) to run make in those directories.

Author: brettle

tests/api/controllers/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DIRECTORIES=$(subst test_suite_supervisor,,$(subst Makefile,,$(shell ls)))
+DIRECTORIES=$(dir $(wildcard */Makefile))
 TARGETS = $(DIRECTORIES:=.Makefile)
 
 .PHONY: release debug profile clean

tests/cache/controllers/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DIRECTORIES=$(subst test_suite_supervisor,,$(subst Makefile,,$(shell ls)))
+DIRECTORIES=$(dir $(wildcard */Makefile))
 TARGETS = $(DIRECTORIES:=.Makefile)
 
 .PHONY: release debug profile clean

tests/other_api/controllers/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DIRECTORIES=$(subst test_suite_supervisor,,$(subst Makefile,,$(shell ls)))
+DIRECTORIES=$(dir $(wildcard */Makefile))
 TARGETS = $(DIRECTORIES:=.Makefile)
 
 .PHONY: release debug profile clean

tests/parser/controllers/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DIRECTORIES=$(subst test_suite_supervisor,,$(subst Makefile,,$(shell ls)))
+DIRECTORIES=$(dir $(wildcard */Makefile))
 TARGETS = $(DIRECTORIES:=.Makefile)
 
 .PHONY: release debug profile clean

tests/physics/controllers/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DIRECTORIES=$(subst test_suite_supervisor,,$(subst Makefile,,$(shell ls)))
+DIRECTORIES=$(dir $(wildcard */Makefile))
 TARGETS = $(DIRECTORIES:=.Makefile)
 
 .PHONY: release debug profile clean

tests/protos/controllers/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DIRECTORIES=$(subst test_suite_supervisor,,$(subst Makefile,,$(shell ls)))
+DIRECTORIES=$(dir $(wildcard */Makefile))
 TARGETS = $(DIRECTORIES:=.Makefile)
 
 .PHONY: release debug profile clean

tests/rendering/controllers/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DIRECTORIES=$(subst test_suite_supervisor,,$(subst Makefile,,$(shell ls)))
+DIRECTORIES=$(dir $(wildcard */Makefile))
 TARGETS = $(DIRECTORIES:=.Makefile)
 
 .PHONY: release debug profile clean