diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2018-03-09 23:27:55 -0800 |
|---|---|---|
| committer | Filipe Brandenburger <filbranden@google.com> | 2018-04-18 11:44:54 -0700 |
| commit | b0382733d80e4963036a6abd4f475ebbea67d72c (patch) | |
| tree | 16d61e2dc914bf7be9a6e2db8d7aabf5f3d81442 | |
| parent | 8651d55c6a317de37dcaa9965157151095a88292 (diff) | |
| download | meson-b0382733d80e4963036a6abd4f475ebbea67d72c.tar.gz | |
Update default of install-umask to 022
And, with that, update the test cases that checked that preserving the
original permissions worked to set install_umask=preserve explicitly in
those projects' default_options.
Tested: ./run_tests.py
| -rw-r--r-- | mesonbuild/coredata.py | 2 | ||||
| -rw-r--r-- | test cases/common/12 data/meson.build | 3 | ||||
| -rw-r--r-- | test cases/common/66 install subdir/meson.build | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 17b28a802..3484421fe 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -456,7 +456,7 @@ builtin_options = { 'backend': [UserComboOption, 'Backend to use.', backendlist, 'ninja'], 'stdsplit': [UserBooleanOption, 'Split stdout and stderr in test logs.', True], 'errorlogs': [UserBooleanOption, "Whether to print the logs from failing tests.", True], - 'install_umask': [UserUmaskOption, 'Default umask to apply on permissions of installed files.', None], + 'install_umask': [UserUmaskOption, 'Default umask to apply on permissions of installed files.', '022'], } # Special prefix-dependent defaults for installation directories that reside in diff --git a/test cases/common/12 data/meson.build b/test cases/common/12 data/meson.build index d855bbaf4..b5b1e8a62 100644 --- a/test cases/common/12 data/meson.build +++ b/test cases/common/12 data/meson.build @@ -1,4 +1,5 @@ -project('data install test', 'c') +project('data install test', 'c', + default_options : ['install_umask=preserve']) install_data(sources : 'datafile.dat', install_dir : 'share/progname') # Some file in /etc that is only read-write by root; add a sticky bit for testing install_data(sources : 'etcfile.dat', install_dir : '/etc', install_mode : 'rw------T') diff --git a/test cases/common/66 install subdir/meson.build b/test cases/common/66 install subdir/meson.build index 403b6f04d..6f92efdb8 100644 --- a/test cases/common/66 install subdir/meson.build +++ b/test cases/common/66 install subdir/meson.build @@ -1,4 +1,5 @@ -project('install a whole subdir', 'c') +project('install a whole subdir', 'c', + default_options : ['install_umask=preserve']) # A subdir with an exclusion: install_subdir('sub2', |