Commit 2a6b6c9a authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Shuah Khan

selftests: harness: remove unneeded __constructor_order_last()

__constructor_order_last() is unneeded.

If __constructor_order_last() is not called on backward-order systems,
__constructor_order will remain 0 instead of being set to
_CONSTRUCTOR_ORDER_BACKWARD (= -1).

__LIST_APPEND() will still take the 'else' branch, so there is no
difference in the behavior.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent f0a1ffa6
...@@ -257,12 +257,6 @@ TEST_F(attest_fixture, att_inval_addr) ...@@ -257,12 +257,6 @@ TEST_F(attest_fixture, att_inval_addr)
att_inval_addr_test(&self->uvio_attest.meas_addr, _metadata, self); att_inval_addr_test(&self->uvio_attest.meas_addr, _metadata, self);
} }
static void __attribute__((constructor)) __constructor_order_last(void)
{
if (!__constructor_order)
__constructor_order = _CONSTRUCTOR_ORDER_BACKWARD;
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int fd = open(UV_PATH, O_ACCMODE); int fd = open(UV_PATH, O_ACCMODE);
......
...@@ -1331,12 +1331,6 @@ static int libbpf_print_fn(enum libbpf_print_level level, ...@@ -1331,12 +1331,6 @@ static int libbpf_print_fn(enum libbpf_print_level level,
return 0; return 0;
} }
static void __attribute__((constructor)) __constructor_order_last(void)
{
if (!__constructor_order)
__constructor_order = _CONSTRUCTOR_ORDER_BACKWARD;
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
/* Use libbpf 1.0 API mode */ /* Use libbpf 1.0 API mode */
......
...@@ -488,12 +488,6 @@ ...@@ -488,12 +488,6 @@
* Use once to append a main() to the test file. * Use once to append a main() to the test file.
*/ */
#define TEST_HARNESS_MAIN \ #define TEST_HARNESS_MAIN \
static void __attribute__((constructor)) \
__constructor_order_last(void) \
{ \
if (!__constructor_order) \
__constructor_order = _CONSTRUCTOR_ORDER_BACKWARD; \
} \
int main(int argc, char **argv) { \ int main(int argc, char **argv) { \
return test_harness_run(argc, argv); \ return test_harness_run(argc, argv); \
} }
...@@ -891,7 +885,6 @@ static struct __fixture_metadata *__fixture_list = &_fixture_global; ...@@ -891,7 +885,6 @@ static struct __fixture_metadata *__fixture_list = &_fixture_global;
static int __constructor_order; static int __constructor_order;
#define _CONSTRUCTOR_ORDER_FORWARD 1 #define _CONSTRUCTOR_ORDER_FORWARD 1
#define _CONSTRUCTOR_ORDER_BACKWARD -1
static inline void __register_fixture(struct __fixture_metadata *f) static inline void __register_fixture(struct __fixture_metadata *f)
{ {
...@@ -1337,8 +1330,7 @@ static int test_harness_run(int argc, char **argv) ...@@ -1337,8 +1330,7 @@ static int test_harness_run(int argc, char **argv)
static void __attribute__((constructor)) __constructor_order_first(void) static void __attribute__((constructor)) __constructor_order_first(void)
{ {
if (!__constructor_order) __constructor_order = _CONSTRUCTOR_ORDER_FORWARD;
__constructor_order = _CONSTRUCTOR_ORDER_FORWARD;
} }
#endif /* __KSELFTEST_HARNESS_H */ #endif /* __KSELFTEST_HARNESS_H */
...@@ -410,13 +410,6 @@ TEST_F_TIMEOUT(rtc, alarm_wkalm_set_minute, 65) { ...@@ -410,13 +410,6 @@ TEST_F_TIMEOUT(rtc, alarm_wkalm_set_minute, 65) {
ASSERT_EQ(new, secs); ASSERT_EQ(new, secs);
} }
static void __attribute__((constructor))
__constructor_order_last(void)
{
if (!__constructor_order)
__constructor_order = _CONSTRUCTOR_ORDER_BACKWARD;
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
switch (argc) { switch (argc) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment