Commit 8130dbcb authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

tests: convert ds1338-test to qtest 



This way, ds1338-test will run for every machine that exposes
an i2c-bus.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 93c3fe2a

tests/Makefile.include

+4 −5
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF) 
check-qtest-sparc64-y += tests/prom-env-test$(EXESUF)

check-qtest-sparc64-y += tests/boot-serial-test$(EXESUF)



check-qtest-arm-y += tests/ds1338-test$(EXESUF)

check-qtest-arm-y += tests/microbit-test$(EXESUF)

check-qtest-arm-y += tests/m25p80-test$(EXESUF)

check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
@@ -676,7 +675,7 @@ libqgraph-obj-y = tests/libqos/qgraph.o 


libqos-obj-y = $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg.o

libqos-obj-y += tests/libqos/malloc.o

libqos-obj-y += tests/libqos/i2c.o tests/libqos/libqos.o

libqos-obj-y += tests/libqos/libqos.o

libqos-spapr-obj-y = $(libqos-obj-y) tests/libqos/malloc-spapr.o

libqos-spapr-obj-y += tests/libqos/libqos-spapr.o

libqos-spapr-obj-y += tests/libqos/rtas.o
@@ -684,14 +683,14 @@ libqos-spapr-obj-y += tests/libqos/pci-spapr.o 
libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o

libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o

libqos-pc-obj-y += tests/libqos/ahci.o

libqos-imx-obj-y = $(libqos-obj-y) tests/libqos/i2c-imx.o

libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/usb.o



# Devices

qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y)

qos-test-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)

qos-test-obj-y += tests/libqos/e1000e.o

qos-test-obj-y += $(libqos-imx-obj-y)

qos-test-obj-y += tests/libqos/i2c.o

qos-test-obj-y += tests/libqos/i2c-imx.o

qos-test-obj-y += tests/libqos/i2c-omap.o

qos-test-obj-y += tests/libqos/sdhci.o

qos-test-obj-y += tests/libqos/tpci200.o
@@ -720,6 +719,7 @@ qos-test-obj-y += tests/libqos/x86_64_pc-machine.o 


# Tests

qos-test-obj-y += tests/ac97-test.o

qos-test-obj-y += tests/ds1338-test.o

qos-test-obj-y += tests/e1000-test.o

qos-test-obj-y += tests/e1000e-test.o

qos-test-obj-y += tests/eepro100-test.o
@@ -771,7 +771,6 @@ tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y) 
tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \

	tests/boot-sector.o tests/acpi-utils.o $(libqos-obj-y)

tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o $(libqos-obj-y)

tests/ds1338-test$(EXESUF): tests/ds1338-test.o $(libqos-imx-obj-y)

tests/microbit-test$(EXESUF): tests/microbit-test.o

tests/m25p80-test$(EXESUF): tests/m25p80-test.o

tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)

tests/ds1338-test.c

+13 −24
Original line number Diff line number Diff line
@@ -21,25 +21,23 @@ 
#include "libqtest.h"

#include "libqos/i2c.h"



#define IMX25_I2C_0_BASE 0x43F80000



#define DS1338_ADDR 0x68



static I2CAdapter *i2c;

static uint8_t addr;



static inline uint8_t bcd2bin(uint8_t x)

{

    return ((x) & 0x0f) + ((x) >> 4) * 10;

}



static void send_and_receive(void)

static void send_and_receive(void *obj, void *data, QGuestAllocator *alloc)

{

    QI2CDevice *i2cdev = (QI2CDevice *)obj;

    I2CAdapter *i2c = i2cdev->bus;



    uint8_t resp[7];

    time_t now = time(NULL);

    struct tm *tm_ptr = gmtime(&now);



    i2c_read_block(i2c, addr, 0, resp, sizeof(resp));

    i2c_read_block(i2c, DS1338_ADDR, 0, resp, sizeof(resp));



    /* check retrieved time againt local time */

    g_assert_cmpuint(bcd2bin(resp[4]), == , tm_ptr->tm_mday);
@@ -47,23 +45,14 @@ static void send_and_receive(void) 
    g_assert_cmpuint(2000 + bcd2bin(resp[6]), == , 1900 + tm_ptr->tm_year);

}



int main(int argc, char **argv)

static void ds1338_register_nodes(void)

{

    QTestState *s = NULL;

    int ret;



    g_test_init(&argc, &argv, NULL);



    s = qtest_start("-display none -machine imx25-pdk -device ds1338,address=0x68");

    i2c = imx_i2c_create(s, IMX25_I2C_0_BASE);

    addr = DS1338_ADDR;



    qtest_add_func("/ds1338/tx-rx", send_and_receive);



    ret = g_test_run();



    qtest_quit(s);

    g_free(i2c);

    QOSGraphEdgeOptions opts = {

        .extra_device_opts = "address=0x68"

    };



    return ret;

    qos_node_create_driver("ds1338", i2c_device_create);

    qos_node_consumes("ds1338", "i2c-bus", &opts);

    qos_add_test("tx-rx", "ds1338", send_and_receive, NULL);

}

libqos_init(ds1338_register_nodes);

tests/libqos/i2c-imx.c

+0 −19
Original line number Diff line number Diff line
@@ -207,25 +207,6 @@ void imx_i2c_init(IMXI2C *s, QTestState *qts, uint64_t addr) 
    s->parent.qts = qts;

}



I2CAdapter *imx_i2c_create(QTestState *qts, uint64_t addr)

{

    IMXI2C *s = g_malloc0(sizeof(*s));



    imx_i2c_init(s, qts, addr);

    return &s->parent;

}



void imx_i2c_free(I2CAdapter *i2c)

{

    IMXI2C *s;



    if (!i2c) {

        return;

    }

    s = container_of(i2c, IMXI2C, parent);

    g_free(s);

}



static void imx_i2c_register_nodes(void)

{

    qos_node_create_driver("imx.i2c", NULL);

tests/libqos/i2c.h

+0 −2
Original line number Diff line number Diff line
@@ -75,7 +75,5 @@ typedef struct IMXI2C { 
} IMXI2C;



void imx_i2c_init(IMXI2C *s, QTestState *qts, uint64_t addr);

I2CAdapter *imx_i2c_create(QTestState *qts, uint64_t addr);

void imx_i2c_free(I2CAdapter *i2c);



#endif