mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Nick Mathewson
23c77f79fd
This is an automatically generated commit, made with the following
kludgey perl script. It results in a number of wide lines, which
I'll clean up in a subsequent commit.
#/usr/bin/perl -w -i
$mod = "NS_MODULE";
$submod = "NS_SUBMODULE";
$last_was_empty = 0;
while (<>) {
s/\bASPECT\(\s*(\w+)\s*,\s*(\w+)\s*\)/$1_$2/;
if (/# *define +NS_MODULE +(\w+)/) {
$mod = $1;
next;
} elsif (/# *define +NS_SUBMODULE +(\w+)/) {
$submod = $1;
next;
}
next if (/#undef NS_(SUB)?MODULE/);
s/NS\(\s*test_main\s*\)/test_${mod}_${submod}/;
s/NS\(\s*(\w+)\s*\)/${mod}_${submod}_$1/g;
s/NS_FULL\(\\s*(\w+)\s*,\s*(\w+),\s*(\w+)\s*\)/$1_$2_$3/;
s/^(\s*)NS_MOCK\(\s*(\w+)\s*\)/$1MOCK($2,\n$1 ${mod}_${submod}_$2)/;
s/NS_UNMOCK\(\s*(\w+)\s*\)/UNMOCK($1)/;
s/TEST_CASE\(\s*(\w+)\s*\)/{ "$1", test_${mod}_$1, TT_FORK, NULL, NULL }/;
s/TEST_CASE_ASPECT\(\s*(\w+)\s*,\s*(\w+)\s*\)/{ "$1_$2", test_${mod}_$1_$2, TT_FORK, NULL, NULL }/;
s/NS_DECL\(\s*([^,]+)\s*,\s*([^,]+)\s*,\s*(\(.*)\);/static $1 ${mod}_${submod}_$2$3;\nATTR_UNUSED static int ${mod}_${submod}_$2_called = 0;/;
s/\bCALLED\(\s*(\w+)\s*\)/${mod}_${submod}_$1_called/;
if (/^$/) {
print if (! $last_was_empty);
$last_was_empty = 1;
} else {
$last_was_empty = 0;
print;
}
if (eof) {
$mod = "NS_MODULE";
$submod = "NS_SUBMODULE";
$last_was_empty = 0;
}
}
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
#
# Date: Thu Jan 9 10:26:10 2020 -0500
#
# On branch disable_ns_macro
# Changes to be committed:
# modified: src/test/test_accounting.c
# modified: src/test/test_compat_libevent.c
# modified: src/test/test_dir.c
# modified: src/test/test_dir_handle_get.c
# modified: src/test/test_dns.c
# modified: src/test/test_options.c
# modified: src/test/test_procmon.c
# modified: src/test/test_rendcache.c
# modified: src/test/test_router.c
# modified: src/test/test_routerset.c
# modified: src/test/test_status.c
# modified: src/test/test_tortls.c
# modified: src/test/test_tortls_openssl.c
# modified: src/test/test_util_format.c
# modified: src/test/test_util_process.c
#
# Untracked files:
# experiments/
# locate_options.sh
# un_ns.pl
#
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
#
# Date: Thu Jan 9 10:26:10 2020 -0500
#
# On branch disable_ns_macro
# Changes to be committed:
# modified: src/test/test_accounting.c
# modified: src/test/test_compat_libevent.c
# modified: src/test/test_dir.c
# modified: src/test/test_dir_handle_get.c
# modified: src/test/test_dns.c
# modified: src/test/test_options.c
# modified: src/test/test_procmon.c
# modified: src/test/test_rendcache.c
# modified: src/test/test_router.c
# modified: src/test/test_routerset.c
# modified: src/test/test_status.c
# modified: src/test/test_tortls.c
# modified: src/test/test_tortls_openssl.c
# modified: src/test/test_util_format.c
# modified: src/test/test_util_process.c
#
# Untracked files:
# experiments/
# locate_options.sh
# un_ns.pl
#
82 lines
1.7 KiB
C
82 lines
1.7 KiB
C
/* Copyright (c) 2010-2020, The Tor Project, Inc. */
|
|
/* See LICENSE for licensing information */
|
|
|
|
#include "orconfig.h"
|
|
#include "core/or/or.h"
|
|
|
|
#include "test/test.h"
|
|
|
|
#include "lib/process/waitpid.h"
|
|
|
|
#include "test/log_test_helpers.h"
|
|
|
|
#ifndef _WIN32
|
|
|
|
static void
|
|
temp_callback(int r, void *s)
|
|
{
|
|
(void)r;
|
|
(void)s;
|
|
}
|
|
|
|
static void
|
|
test_util_process_set_waitpid_callback(void *ignored)
|
|
{
|
|
(void)ignored;
|
|
waitpid_callback_t *res1 = NULL, *res2 = NULL;
|
|
setup_full_capture_of_logs(LOG_WARN);
|
|
pid_t pid = (pid_t)42;
|
|
|
|
res1 = set_waitpid_callback(pid, temp_callback, NULL);
|
|
tt_assert(res1);
|
|
|
|
res2 = set_waitpid_callback(pid, temp_callback, NULL);
|
|
tt_assert(res2);
|
|
expect_single_log_msg(
|
|
"Replaced a waitpid monitor on pid 42. That should be "
|
|
"impossible.\n");
|
|
|
|
done:
|
|
teardown_capture_of_logs();
|
|
clear_waitpid_callback(res1);
|
|
clear_waitpid_callback(res2);
|
|
}
|
|
|
|
static void
|
|
test_util_process_clear_waitpid_callback(void *ignored)
|
|
{
|
|
(void)ignored;
|
|
waitpid_callback_t *res;
|
|
setup_capture_of_logs(LOG_WARN);
|
|
pid_t pid = (pid_t)43;
|
|
|
|
clear_waitpid_callback(NULL);
|
|
|
|
res = set_waitpid_callback(pid, temp_callback, NULL);
|
|
clear_waitpid_callback(res);
|
|
expect_no_log_entry();
|
|
|
|
#if 0
|
|
/* No. This is use-after-free. We don't _do_ that. XXXX */
|
|
clear_waitpid_callback(res);
|
|
expect_log_msg("Couldn't remove waitpid monitor for pid 43.\n");
|
|
#endif
|
|
|
|
done:
|
|
teardown_capture_of_logs();
|
|
}
|
|
#endif /* !defined(_WIN32) */
|
|
|
|
#ifndef _WIN32
|
|
#define TEST(name) { #name, test_util_process_##name, 0, NULL, NULL }
|
|
#else
|
|
#define TEST(name) { #name, NULL, TT_SKIP, NULL, NULL }
|
|
#endif
|
|
|
|
struct testcase_t util_process_tests[] = {
|
|
TEST(set_waitpid_callback),
|
|
TEST(clear_waitpid_callback),
|
|
END_OF_TESTCASES
|
|
};
|
|
|