]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'chrt_reset_on_fork_test' of https://github.com/cgoesche/util-linux...
authorKarel Zak <kzak@redhat.com>
Wed, 6 May 2026 09:41:58 +0000 (11:41 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 6 May 2026 09:41:58 +0000 (11:41 +0200)
* 'chrt_reset_on_fork_test' of https://github.com/cgoesche/util-linux-fork:
  tests: (chrt) add --reset-on-fork test
  tests: (helpers) simple tool to create a child process

# Conflicts:
# meson.build
# tests/helpers/Makemodule.am

1  2 
meson.build
tests/commands.sh
tests/helpers/Makemodule.am

diff --cc meson.build
index 92c916b7136e9576e61201655176ee7997778bcd,0e5248da2cce776576237c4eda753bbf26cd52be..b1efd315ca997edf8f2ef0a9eb7c4d497766c2f1
@@@ -4036,17 -4006,16 +4036,27 @@@ if not is_disabler(exe
    exes += exe
  endif
  
 +exe = executable(
 +  'test_threads_create',
 +  'tests/helpers/test_threads_create.c',
 +  include_directories : includes,
 +  dependencies : thread_libs,
 +  link_with : lib_common,
 +  build_by_default: program_tests)
 +if not is_disabler(exe)
 +  exes += exe
 +endif
 +
+ exe = executable(
+   'test_child_create',
+   'tests/helpers/test_child_create.c',
+   include_directories : includes,
+   link_with : lib_common,
+   build_by_default: program_tests)
+ if not is_disabler(exe)
+   exes += exe
+ endif
  ############################################################
  
  if conf.get('HAVE_OPENAT').to_string() == '1'
Simple merge
index 4b575ae38933e947a0bd02a893d7129f169925e1,d374c0db185466911ce318800f91a4f2644831ba..c5033f3b84eeea7d40899ed033e6f9b16a96f6bf
@@@ -64,6 -64,6 +64,10 @@@ endi
  check_PROGRAMS += test_open_twice
  test_open_twice_SOURCES = tests/helpers/test_open_twice.c
  
 +check_PROGRAMS += test_threads_create
 +test_threads_create_SOURCES = tests/helpers/test_threads_create.c
 +test_threads_create_LDADD =  $(LDADD) libcommon.la $(PTHREAD_LIBS)
++
+ check_PROGRAMS += test_child_create
+ test_child_create_SOURCES = tests/helpers/test_child_create.c
+ test_child_create_LDADD = $(LDADD) libcommon.la