Use dynamic link for tests
This commit is contained in:
@@ -99,7 +99,7 @@ run_redoxer() {
|
||||
export CARGOFLAGS=""
|
||||
export CARGO_TEST="redoxer"
|
||||
export TEST_RUNNER="redoxer exec --folder . --"
|
||||
MAKE_ACTION="$MAKE_ACTION SKIP_REDOX=1"
|
||||
MAKE_ACTION="$MAKE_ACTION SKIP_REDOX=1 NATIVE_RELIBC=1"
|
||||
else
|
||||
REDOXER_ENV=""
|
||||
fi
|
||||
|
||||
+5
-4
@@ -302,8 +302,9 @@ NAMES=\
|
||||
EXPECT_INPUT_NAMES=\
|
||||
unistd/getpass
|
||||
|
||||
# TODO: Dynamic linking is currently broken on Redox
|
||||
# TODO: Dynamic linking doesn't work with NATIVE_RELIBC=0
|
||||
# TODO: Some tests in NAMES break the kernel
|
||||
# TODO: Reduce bins_static tests?
|
||||
ifeq ($(SKIP_REDOX),0)
|
||||
BINS=$(patsubst %,$(BUILD)/bins_static/%,$(NAMES))
|
||||
BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(NAMES))
|
||||
@@ -311,11 +312,11 @@ BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(DYNAMIC_ONLY_NAMES))
|
||||
EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(EXPECT_NAMES))
|
||||
EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(DYNAMIC_ONLY_NAMES))
|
||||
EXPECT_INPUT_BINS=$(patsubst %,$(BUILD)/bins_expect_input/%,$(EXPECT_INPUT_NAMES))
|
||||
else
|
||||
EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(EXPECT_NAMES))
|
||||
EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(DYNAMIC_ONLY_NAMES))
|
||||
endif
|
||||
|
||||
EXPECT_BINS=$(patsubst %,$(BUILD)/bins_static/%,$(EXPECT_NAMES))
|
||||
|
||||
|
||||
CARGO_TEST?=cargo
|
||||
TEST_RUNNER?=
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ static bool check_mode(
|
||||
stderr,
|
||||
"Mode mismatch\n\tExpected: %o\n\tActual: %o\n",
|
||||
expected,
|
||||
stat.st_mode
|
||||
stat.st_mode & 0777
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user