Page MenuHomeFreeBSD
Files F167595937

D55221.id.diff
No OneTemporary
Actions

D55221.id.diff
View Options

diff --git a/usr.sbin/mixer/tests/Makefile b/usr.sbin/mixer/tests/Makefile
--- a/usr.sbin/mixer/tests/Makefile
+++ b/usr.sbin/mixer/tests/Makefile
@@ -1,6 +1,7 @@
ATF_TESTS_SH+= mixer_test
# mixer tests fiddle with a singleton dummy audio device.
-TEST_METADATA.mixer_test= is_exclusive=true
+TEST_METADATA.mixer_test= is_exclusive=true \
+ required_kmods="snd_dummy"
.include <bsd.test.mk>
diff --git a/usr.sbin/mixer/tests/mixer_test.sh b/usr.sbin/mixer/tests/mixer_test.sh
--- a/usr.sbin/mixer/tests/mixer_test.sh
+++ b/usr.sbin/mixer/tests/mixer_test.sh
@@ -45,13 +45,6 @@
test -r "test_mixer_conf" && mixer $(cat test_mixer_conf)
}
-load_dummy()
-{
- if ! kldload -n snd_dummy; then
- atf_skip "cannot load snd_dummy.ko"
- fi
-}
-
set_default()
{
deflt_unit="$(mixer | grep ^pcm | cut -f1 -d:)"
@@ -78,7 +71,6 @@
}
o_flag_body()
{
- load_dummy
mixer_exists
set_default
@@ -96,7 +88,6 @@
}
d_flag_body()
{
- load_dummy
mixer_exists
set_default
@@ -118,7 +109,6 @@
}
volume_body()
{
- load_dummy
mixer_exists
set_default
save_conf
@@ -204,7 +194,6 @@
}
mute_body()
{
- load_dummy
mixer_exists
set_default
save_conf
@@ -248,7 +237,6 @@
}
recsrc_body()
{
- load_dummy
mixer_exists
set_default
save_conf

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 23, 11:58 PM (16 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37166428
Default Alt Text
D55221.id.diff (1 KB)

Event Timeline