Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into develop #41

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Merge master into develop #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8977e52
Ensure that test_suite.pt only tries to build controllers which have …
brettle Sep 21, 2024
0a1f1eb
Fix-references-to-raw-github-content (#6667)
brettle Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/api/controllers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/cache/controllers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/cache/protos/ShapeWithFixedWebTexture.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/other_api/controllers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/parser/controllers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/physics/controllers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/protos/controllers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/controllers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading