Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ TEST_DIR := $(CURDIR)/tests
.DEFAULT_GOAL := help

.PHONY: build-scrt build-base build-web build-ad build-ctf build-all \
smoke-web smoke-ad smoke-ctf test-all test-scrt \
smoke-base smoke-web smoke-ad smoke-ctf test-all test-scrt \
lint ci images clean-images clean help

# ============================================================================
Expand Down Expand Up @@ -77,6 +77,13 @@ build-all:
# Images are built first if the tags don't already exist.
# ============================================================================

## smoke-base: Tool presence check — base image
smoke-base: build-base
@printf '==> [base] smoke test\n'
@docker run --rm \
-v "$(TEST_DIR):/tests:ro" \
$(BASE_IMAGE) sh /tests/smoke-base.sh

## smoke-web: Tool presence check — web image
smoke-web: build-web
@printf '==> [web] smoke test\n'
Expand All @@ -98,8 +105,8 @@ smoke-ctf: build-ctf
-v "$(TEST_DIR):/tests:ro" \
$(CTF_IMAGE) sh /tests/smoke-ctf.sh

## test-all: Run smoke tests for all three scenario images
test-all: smoke-web smoke-ad smoke-ctf
## test-all: Run smoke tests for all four images (base + scenarios)
test-all: smoke-base smoke-web smoke-ad smoke-ctf

# ============================================================================
# scrt integration — verify the binary starts and sees Docker
Expand Down
Binary file not shown.
1 change: 0 additions & 1 deletion resources/mozilla/firefox/fr3d.default/addons.json

This file was deleted.

Binary file removed resources/mozilla/firefox/fr3d.default/cert9.db
Binary file not shown.
5 changes: 0 additions & 5 deletions resources/mozilla/firefox/fr3d.default/compatibility.ini

This file was deleted.

1 change: 0 additions & 1 deletion resources/mozilla/firefox/fr3d.default/containers.json

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion resources/mozilla/firefox/fr3d.default/extensions.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion resources/mozilla/firefox/fr3d.default/handlers.json

This file was deleted.

Binary file removed resources/mozilla/firefox/fr3d.default/key4.db
Binary file not shown.
1 change: 0 additions & 1 deletion resources/mozilla/firefox/fr3d.default/lock

This file was deleted.

Binary file not shown.
5 changes: 0 additions & 5 deletions resources/mozilla/firefox/fr3d.default/pkcs11.txt

This file was deleted.

Loading
Loading