diff mbox series

[20/51] tests/qtest: i440fx-test: Skip running request_{bios, pflash} for win32

Message ID 20220824094029.1634519-21-bmeng.cn@gmail.com (mailing list archive)
State New, archived
Headers show
Series tests/qtest: Enable running qtest on Windows | expand

Commit Message

Bin Meng Aug. 24, 2022, 9:39 a.m. UTC 
From: Bin Meng <bin.meng@windriver.com>

The request_{bios,pflash} test cases call mmap() which does not
exist on win32. Exclude them.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 tests/qtest/i440fx-test.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Thomas Huth Aug. 25, 2022, 11:40 a.m. UTC | #1 
On 24/08/2022 11.39, Bin Meng wrote:
> From: Bin Meng <bin.meng@windriver.com>
> 
> The request_{bios,pflash} test cases call mmap() which does not
> exist on win32. Exclude them.
> 
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
> 
>   tests/qtest/i440fx-test.c | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/tests/qtest/i440fx-test.c b/tests/qtest/i440fx-test.c
> index 6d7d4d8d8f..3890f1237c 100644
> --- a/tests/qtest/i440fx-test.c
> +++ b/tests/qtest/i440fx-test.c
> @@ -278,6 +278,8 @@ static void test_i440fx_pam(gconstpointer opaque)
>       qtest_end();
>   }
>   
> +#ifndef _WIN32
> +
>   #define BLOB_SIZE ((size_t)65536)
>   #define ISA_BIOS_MAXSZ ((size_t)(128 * 1024))
>   
> @@ -396,6 +398,8 @@ static void request_pflash(FirmwareTestFixture *fixture,
>       fixture->is_bios = false;
>   }
>   
> +#endif /* _WIN32 */
> +
>   int main(int argc, char **argv)
>   {
>       TestData data;
> @@ -406,8 +410,10 @@ int main(int argc, char **argv)
>   
>       qtest_add_data_func("i440fx/defaults", &data, test_i440fx_defaults);
>       qtest_add_data_func("i440fx/pam", &data, test_i440fx_pam);
> +#ifndef _WIN32
>       add_firmware_test("i440fx/firmware/bios", request_bios);
>       add_firmware_test("i440fx/firmware/pflash", request_pflash);
> +#endif
>   
>       return g_test_run();
>   }

Reviewed-by: Thomas Huth <thuth@redhat.com>
Marc-André Lureau Aug. 31, 2022, 1:40 p.m. UTC | #2 
Hi

On Wed, Aug 24, 2022 at 2:15 PM Bin Meng <bmeng.cn@gmail.com> wrote:

> From: Bin Meng <bin.meng@windriver.com>
>
> The request_{bios,pflash} test cases call mmap() which does not
> exist on win32. Exclude them.
>
>
We can fairly easily rewrite the create_blob_file() function to be portable
though, something like:

static char *create_blob_file(void)
{
    g_autofree uint8_t *buf = g_malloc(BLOB_SIZE);
    GError *error = NULL;
    char *pathname;
    int fd;
    size_t i;

    fd = g_file_open_tmp("blob_XXXXXX", &pathname, &error);
    g_assert_no_error(error);

    for (i = 0; i < BLOB_SIZE; ++i) {
        buf[i] = i;
    }

    g_file_set_contents(pathname, (char *)buf, BLOB_SIZE, &error);
    g_assert_no_error(error);
    close(fd);

    return pathname;
}

Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
>
>  tests/qtest/i440fx-test.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/tests/qtest/i440fx-test.c b/tests/qtest/i440fx-test.c
> index 6d7d4d8d8f..3890f1237c 100644
> --- a/tests/qtest/i440fx-test.c
> +++ b/tests/qtest/i440fx-test.c
> @@ -278,6 +278,8 @@ static void test_i440fx_pam(gconstpointer opaque)
>      qtest_end();
>  }
>
> +#ifndef _WIN32
> +
>  #define BLOB_SIZE ((size_t)65536)
>  #define ISA_BIOS_MAXSZ ((size_t)(128 * 1024))
>
> @@ -396,6 +398,8 @@ static void request_pflash(FirmwareTestFixture
> *fixture,
>      fixture->is_bios = false;
>  }
>
> +#endif /* _WIN32 */
> +
>  int main(int argc, char **argv)
>  {
>      TestData data;
> @@ -406,8 +410,10 @@ int main(int argc, char **argv)
>
>      qtest_add_data_func("i440fx/defaults", &data, test_i440fx_defaults);
>      qtest_add_data_func("i440fx/pam", &data, test_i440fx_pam);
> +#ifndef _WIN32
>      add_firmware_test("i440fx/firmware/bios", request_bios);
>      add_firmware_test("i440fx/firmware/pflash", request_pflash);
> +#endif
>
>      return g_test_run();
>  }
> --
> 2.34.1
>
>
>
Bin Meng Sept. 2, 2022, 8:29 a.m. UTC | #3 
On Wed, Aug 31, 2022 at 9:40 PM Marc-André Lureau
<marcandre.lureau@gmail.com> wrote:
>
> Hi
>
> On Wed, Aug 24, 2022 at 2:15 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>>
>> From: Bin Meng <bin.meng@windriver.com>
>>
>> The request_{bios,pflash} test cases call mmap() which does not
>> exist on win32. Exclude them.
>>
>
> We can fairly easily rewrite the create_blob_file() function to be portable though, something like:

Thanks for the suggestion!

Will spin a patch in v2.

>
> static char *create_blob_file(void)
> {
>     g_autofree uint8_t *buf = g_malloc(BLOB_SIZE);
>     GError *error = NULL;
>     char *pathname;
>     int fd;
>     size_t i;
>
>     fd = g_file_open_tmp("blob_XXXXXX", &pathname, &error);
>     g_assert_no_error(error);
>
>     for (i = 0; i < BLOB_SIZE; ++i) {
>         buf[i] = i;
>     }
>
>     g_file_set_contents(pathname, (char *)buf, BLOB_SIZE, &error);
>     g_assert_no_error(error);
>     close(fd);
>
>     return pathname;
> }
>
>> Signed-off-by: Bin Meng <bin.meng@windriver.com>
>> ---
>>
>>  tests/qtest/i440fx-test.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>

Regards,
Bin
diff mbox series

Patch

diff --git a/tests/qtest/i440fx-test.c b/tests/qtest/i440fx-test.c
index 6d7d4d8d8f..3890f1237c 100644
--- a/tests/qtest/i440fx-test.c
+++ b/tests/qtest/i440fx-test.c
@@ -278,6 +278,8 @@  static void test_i440fx_pam(gconstpointer opaque)
     qtest_end();
 }
 
+#ifndef _WIN32
+
 #define BLOB_SIZE ((size_t)65536)
 #define ISA_BIOS_MAXSZ ((size_t)(128 * 1024))
 
@@ -396,6 +398,8 @@  static void request_pflash(FirmwareTestFixture *fixture,
     fixture->is_bios = false;
 }
 
+#endif /* _WIN32 */
+
 int main(int argc, char **argv)
 {
     TestData data;
@@ -406,8 +410,10 @@  int main(int argc, char **argv)
 
     qtest_add_data_func("i440fx/defaults", &data, test_i440fx_defaults);
     qtest_add_data_func("i440fx/pam", &data, test_i440fx_pam);
+#ifndef _WIN32
     add_firmware_test("i440fx/firmware/bios", request_bios);
     add_firmware_test("i440fx/firmware/pflash", request_pflash);
+#endif
 
     return g_test_run();
 }