Commit graph

18 commits

Author SHA1 Message Date
Kelvin M. Klann
5abf0577a7
feature: add ${PROJECTS} macro (#7157)
Based on the new ~/Projects directory from version 0.20 of the
xdg-user-dirs specification[1]:

* `XDG_PROJECTS_DIR="$HOME/Projects"`

Relates to #7147 #7151.

[1] https://www.freedesktop.org/wiki/Software/xdg-user-dirs/
2026-05-09 13:19:42 +00:00
Kelvin M. Klann
46a111166e test/fs: simplify error messages in macro tests
Some checks failed
Build / build (push) Has been cancelled
Codespell / codespell (push) Has been cancelled
Test / test-main (push) Has been cancelled
Test / test-fs (push) Has been cancelled
Test / test-environment (push) Has been cancelled
Test / test-utils (push) Has been cancelled
Test / test-network (push) Has been cancelled
To make it easier to add new directories.

This is similar to commit 1511aab5f
("test/fs/disable-devnull-symlink.exp: simplify error messages",
2026-04-27).

Relates to #7147 #7151.
2026-05-05 04:46:59 -03:00
Kelvin M. Klann
d9739c6d55 test/fs/macro.exp: increase timeout to 3s
The test is failing at multiple parts in CI due to timeouts.

From [1]:

    runner@runnervmrc6n4:~/work/firejail/firejail/test/fs$
    <=./macro-blacklist.profile ls ~/Videos; echo ret $?
    Reading profile ./macro-blacklist.profile
    firejail version 0.9.81

    Parent pid 6385, child pid 6386
    Base filesystem installed in 0.25 ms
    firejail ls /home/runner/Videos
    Child process initialized in 7.58 ms
    ls: cannot open directory '/home/runner/Videos': Permission denied

    Parent is shutting down, bye...
    ret 2
    runner@runnervmrc6n4:~/work/firejail/firejail/test/fs$
    <le touch ~/Desktop/_firejail_test_file; echo ret $?
    Reading profile ./macro-readonly.profile
    firejail version 0.9.81

    Parent pid 6390, child pid 6391
    Base filesystem installed in 3.23 ms
    TESTING ERROR 19

From [2]:

    runner@runnervmrc6n4:~/work/firejail/firejail/test/fs$
    <macro-blacklist.profile ls ~/Documents; echo ret $?
    Reading profile ./macro-blacklist.profile
    firejail version 0.9.81

    Parent pid 6382, child pid 6383
    Base filesystem installed in 0.26 ms
    firejail ls /home/runner/Documents
    Child process initialized in 7.84 ms
    ls: cannot open directory '/home/runner/Documents': Permission denied

    Parent is shutting down, bye...
    ret 2
    runner@runnervmrc6n4:~/work/firejail/firejail/test/fs$
    <macro-blacklist.profile ls ~/Downloads; echo ret $?
    Reading profile ./macro-blacklist.profile
    firejail version 0.9.81

    Parent pid 6387, child pid 6388
    Base filesystem installed in 0.25 ms
    firejail ls /home/runner/Downloads
    TESTING ERROR 11

This amends commit 574885778 ("test/fs/macro.exp: reduce timeout and
sleep", 2026-04-24) / PR #7147.

[1] https://github.com/netblue30/firejail/actions/runs/25076422708/job/73470137137
[2] https://github.com/netblue30/firejail/actions/runs/25076422708/job/73522630528
2026-04-29 02:58:06 -03:00
Kelvin M. Klann
96e66e1020 test/fs/macro.exp: check return value
Fail faster instead of waiting for the timeout.

See also commit a4e6495fd ("modif: do not follow symlinks to /dev/null
on disable (#7129)", 2026-04-17).
2026-04-27 04:47:37 -03:00
Kelvin M. Klann
574885778a test/fs/macro.exp: reduce timeout and sleep
* timeout: 10s -> 1s
* sleep: 1000ms -> 100ms
2026-04-27 04:47:37 -03:00
Kelvin M. Klann
096aa0337f test/fs/macro.exp: use _firejail_test_file
Use `_firejail_test_file` instead of `blablabla`, as the former is a
more common filename in tests and is what is actually removed in
test/fs/fs.sh.

Related commits:

* 2155203b3 ("xdg macro testing", 2018-08-07)
* 188d5f16d ("--profile=FILE rework (#6896)", 2026-01-05)
2026-04-27 04:47:37 -03:00
Kelvin M. Klann
68427a2333
test: fix unescaped newlines in error messages (#7146)
Commands used to search and replace:

    $ git grep -IElz 'ERROR [0-9]+n"' -- test |
      xargs -0 perl -pi -e 's/(ERROR [0-9]+)n"/$1\\n"/'

Related commits:

* 63e16bfcd ("major cleanup and testing", 2016-11-13)
* 2155203b3 ("xdg macro testing", 2018-08-07)
2026-04-27 07:36:57 +00:00
netblue30
188d5f16d4 --profile=FILE rework (#6896) 2026-01-05 12:42:17 -05:00
netblue30
2a5062c800 copyright 2014-2026 all over the place 2025-12-30 08:20:44 -05:00
netblue30
212ac3cb19 update copyright 2025-01-12 19:26:24 -05:00
netblue30
ae8f62dba0 update copyright 2024 2024-01-12 11:23:22 -05:00
David Fetter
2dc16cc247
Update copyright to 2023 (#5664) 2023-02-15 18:57:44 +00:00
smitsohu
7578e86ef8 testing: fix expect matching of numbers
The sandbox timestamp should not be available for matching
when output is already expected from the next command
(this is only a problem if numeric output if expected from the
first command in the sandbox).

A possible alternative would be to flush the expect output buffer
with 'expect "*"' after the sandbox is up.
2022-02-09 18:30:45 +01:00
netblue30
121749f0ca 2022 copyright update 2022-01-07 12:23:47 -05:00
startx2017
2609e5cf0b copyright update 2021-02-15 08:33:05 -05:00
glitsj16
6f3867fdb8
move copyright to 2020 (part 2) (#3181)
* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020

* move copyright statement to 2020
2020-01-24 22:46:30 +00:00
smitsohu
0d2f252230 move copyright statement to 2019 2019-02-07 14:58:35 +01:00
netblue30
2155203b3e xdg macro testing 2018-08-07 09:08:21 -04:00