src/basic/filesystem-sets.py

@@ -282,11 +282,6 @@ def generate_fs_type_to_string():
 #include <linux/magic.h>
 #include "filesystems.h"
 
-/* PROJECT_FILE, which is used by log_xyz() thus also used by assert_not_reached(), cannot be used in
- * generated files, as the build directory may be outside of the source directory. */
-#undef PROJECT_FILE
-#define PROJECT_FILE __FILE__
-
 const char* fs_type_to_string(statfs_f_type_t magic) {
         switch (magic) {""")
 

test/units/TEST-13-NSPAWN.nspawn.sh

@@ -933,7 +933,7 @@ EOF
 
 testcase_machinectl_bind() {
     local service_path service_name root container_name ec
-    local cmd="timeout 10 bash -c 'until [[ -f /tmp/marker ]] && [[ -f /tmp/marker-varlink ]]; do sleep .5; done'; sleep 3"
+    local cmd='for i in $(seq 1 20); do if test -f /tmp/marker && test -f /tmp/marker-varlink; then exit 0; fi; sleep .5; done; exit 1;'
 
     root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.machinectl-bind.XXX)"
     create_dummy_container "$root"