Merge pull request #6668 from cyberbotics/sync-master-0a1f1eb4c

Merge master into develop
cyberbotics · Sep 22, 2024 · c769d75 · c769d75
2 parents 9eb501e + f39bd26
commit c769d75
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/tests/api/controllers/Makefile b/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

diff --git a/tests/cache/controllers/Makefile b/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

diff --git a/tests/cache/protos/ShapeWithFixedWebTexture.proto b/tests/cache/protos/ShapeWithFixedWebTexture.proto
@@ -8,7 +8,7 @@ PROTO ShapeWithFixedWebTexture [
     appearance PBRAppearance {
       baseColorMap ImageTexture {
         url [
-          "https://raw.githubusercontent.com/cyberbotics/webots/develop/tests/cache/protos/textures/blue_texture.jpg"
+          "webots://tests/cache/protos/textures/blue_texture.jpg"
         ]
       }
     }

diff --git a/tests/other_api/controllers/Makefile b/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

diff --git a/tests/parser/controllers/Makefile b/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

diff --git a/tests/physics/controllers/Makefile b/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

diff --git a/tests/protos/controllers/Makefile b/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

diff --git a/tests/rendering/controllers/Makefile b/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