Skip to content

Commit f5552f8

Browse files
committed
Merge pull request #62 from peppelakappa/master
let the test pass on kernel >= 4
2 parents c3209df + 2f8946d commit f5552f8

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/minunit.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ static const char *test_is_legacy_kernel()
1717

1818
struct utsname kernel;
1919
uname(&kernel);
20+
21+
int kern_major_release = (int)(kernel.release[0] - '0');
2022

21-
mu_assert("Kernel major version is not 3.", kernel.release[0] == '3');
22-
23+
mu_assert("Kernel major version is minor than 3.", kern_major_release > 2);
2324
char *pch;
2425
pch = strtok(kernel.release, ".");
2526
pch = strtok(NULL, ".");
2627

2728
int minor = atoi(pch);
2829

29-
if (minor < 15)
30+
if ((kern_major_release <= 3) && minor < 15)
3031
mu_assert("Legacy kernel not detected by mbpfan.", is_legacy_kernel() == 1);
3132
else
3233
mu_assert("Non-legacy kernel not detected by mbpfan", is_legacy_kernel() == 0);
@@ -214,6 +215,7 @@ int tests()
214215
{
215216
printf("Starting the tests..\n");
216217
printf("It is normal for them to take a bit to finish.\n");
218+
217219
const char *result = all_tests();
218220

219221
if (result != 0) {
@@ -226,4 +228,4 @@ int tests()
226228
printf("Tests run: %d\n", tests_run);
227229

228230
return result != 0;
229-
}
231+
}

0 commit comments

Comments
 (0)