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

omichel · web-flow · commit c769d75836b7 · 2024-09-22T13:32:03.000+02:00
Merge master into develop
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

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ PROTO ShapeWithFixedWebTexture [`
`8`	`8`	`appearance PBRAppearance {`
`9`	`9`	`baseColorMap ImageTexture {`
`10`	`10`	`url [`
`11`		`- "https://raw.githubusercontent.com/cyberbotics/webots/develop/tests/cache/protos/textures/blue_texture.jpg"`
	`11`	`+ "webots://tests/cache/protos/textures/blue_texture.jpg"`
`12`	`12`	`]`
`13`	`13`	`}`
`14`	`14`	`}`