dtc: test: make the test output more friendly
PATCH 1/1 dtc: test: make the test output more friendly
when run the command 'make check', the format of the output as the follow:
../fdtput label01.dts.fdtput.test.dtb -p /you/are/drunk/sir/winston slurp -ts twice: PASS
../fdtput label01.dts.fdtput.test.dtb -cp "Lorem ipsum dolor sit amet, cons"...<4119 bytes>PASS
../fdtput label01.dts.fdtput.test.dtb -cp /chosen: PASS
../fdtput label01.dts.fdtput.test.dtb -cp /chosen/son: PASS
this patch make the format of the output more firendly to developer, as the follow:
../fdtput label01.dts.fdtput.test.dtb -p /you/are/drunk/sir/winston slurp -ts twice: [ PASS ] ../fdtput label01.dts.fdtput.test.dtb -cp "Lorem ipsum dolor sit amet, cons"...<4119 bytes> [ PASS ] ../fdtput label01.dts.fdtput.test.dtb -cp /chosen: [ PASS ] ../fdtput label01.dts.fdtput.test.dtb -cp /chosen/son: [ PASS ]
The test result print ooutput at the right side of the terminal. The "PASS" word printed in green color and the "FAILED" word printed in red color, which are more friendly to developer.
--- tests/tests.h | 27 +++++++++++++++++---------- tests/tests.sh | 13 +++++++++++-- tests/testutils.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 13 deletions(-)
tests/tests.h +17 -10
@@ -40,6 +40,7 @@ void test_init(int argc, char *argv[]);/* Each test case must define this function */ void cleanup (void ); +int get_terminal_width_height (const int fd,int *width,int *height);#define verbose_printf (...) \ if (verbose_test) { \
@@ -50,11 +51,14 @@ void cleanup(void); #define ERROR(fmt, args...) fprintf(stderr, ERR fmt, ## args) -#define PASS () \ - do { \ - cleanup(); \ - printf("PASS\n"); \ - exit(RC_PASS); \ +#define PASS () \ + do { \ + int width, height; \ + cleanup(); \ + get_terminal_width_height(0, &width, &height); \ + printf("\033[%d;%dH", height, width - 9); \ + printf("[\033[0;32;1m PASS \033[0m]\n"); \ + exit(RC_PASS); \ } while (0)#define PASS_INCONCLUSIVE () \
@@ -72,11 +76,14 @@ void cleanup(void); }while (0 ) /* Look out, gcc extension below... */ -#define FAIL (fmt, ...) \ - do { \ - cleanup(); \ - printf("FAIL\t" fmt "\n", ##__VA_ARGS__); \ - exit(RC_FAIL); \ +#define FAIL (fmt, ...) \ + do { \ + int width, height; \ + cleanup(); \ + get_terminal_width_height(0, &width, &height); \ + printf("\033[%d;%dH", height, width - 9); \ + printf("[\033[0;31;1m FAIL ]\n" fmt "\033[0m\n", ##__VA_ARGS__); \ + exit(RC_FAIL); \ } while (0)#define CONFIG (fmt, ...) \
tests/tests.sh +11 -2
@@ -1,12 +1,21 @@ # Common functions for shell testcases PASS () { - echo "PASS" + cols=`tput cols` + lines=`tput lines` + ((pos=$cols-10)) + tput cup $lines $pos + echo -e "[\033[0;32;1m PASS \033[0m]" exit 0 } FAIL () { - echo "FAIL" "$@" + cols=`tput cols` + lines=`tput lines` + ((pos=$cols-10)) + tput cup $lines $pos + echo -e "[\033[0;31;1m FAIL \033[0m]" + echo -e "\033[0;31;1m$@\033[0m" exit 2 }
tests/testutils.c +28 -1
@@ -29,7 +29,7 @@#include <signal.h> #include <unistd.h> #include <fcntl.h> - +#include <sys/ioctl.h> #include <libfdt.h> #include "tests.h"
@@ -41,6 +41,33 @@ void __attribute__((weak)) cleanup(void) { } +int get_terminal_width_height (const int fd,int *width,int *height) +{ +struct winsize win = {0 ,0 ,0 ,0 }; +int ret =ioctl (fd,TIOCGWINSZ , &win); + +if (height) { +if (!win.ws_row) { +char *s =getenv ("LINES" ); +if (s) win.ws_row =atoi (s); + } +if (win.ws_row <=1 || win.ws_row >=30000 ) + win.ws_row =24 ; + *height = (int ) win.ws_row; + } + +if (width) { +if (!win.ws_col) { +char *s =getenv ("COLUMNS" ); +if (s) win.ws_col =atoi (s); + } +if (win.ws_col <=1 || win.ws_col >=30000 ) + win.ws_col =80 ; + *width = (int ) win.ws_col; + } + +return ret; +}static void sigint_handler (int signum,siginfo_t *si,void *uc) {cleanup ();
Signature · 6 lines
1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree-compiler" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1414120757-17288-1-git-send-email-long.wanglong-hv44wF8Li93QT0dZR+AlfA@public.gmane.org
Quoted 14 lines · Wang Long
when run the command 'make check', the format of the output as the follow:
../fdtput label01.dts.fdtput.test.dtb -p /you/are/drunk/sir/winston slurp -ts twice: PASS
../fdtput label01.dts.fdtput.test.dtb -cp "Lorem ipsum dolor sit amet, cons"...<4119 bytes>PASS
../fdtput label01.dts.fdtput.test.dtb -cp /chosen: PASS
../fdtput label01.dts.fdtput.test.dtb -cp /chosen/son: PASSthis patch make the format of the output more firendly to developer, as the follow:
../fdtput label01.dts.fdtput.test.dtb -p /you/are/drunk/sir/winston slurp -ts twice: [ PASS ] ../fdtput label01.dts.fdtput.test.dtb -cp "Lorem ipsum dolor sit amet, cons"...<4119 bytes> [ PASS ] ../fdtput label01.dts.fdtput.test.dtb -cp /chosen: [ PASS ] ../fdtput label01.dts.fdtput.test.dtb -cp /chosen/son: [ PASS ]
Quoted 4 lines
The test result print ooutput at the right side of the terminal. The "PASS" word printed in green color and the "FAILED" word printed in red color, which are more friendly to developer.
Sorry, I'm not inclined to accept this in the current form.
This approach assumes a particular type of ansi compatible terminal which I'd prefer not to do.
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson