sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-24 03:29:02 +00:00
Code Issues Releases Wiki Activity

Merge pull request #339 from marcbonnici/revent_fix

Browse Source 
Revent fix / improvments
This commit is contained in:
setrofim 2017-02-01 18:10:32 +00:00 committed by GitHub
commit da7a3276ed
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
wlauto/common/bin/arm64/revent
View File

Binary file not shown.

BIN
wlauto/common/bin/armeabi/revent
View File

Binary file not shown.

5
wlauto/external/revent/revent.c vendored
View File

@ -711,7 +711,7 @@ int init_general_input_devices(input_devices_t *devices)
uint32_t num, i, path_len; uint32_t num, i, path_len;
char paths[INPDEV_MAX_DEVICES][INPDEV_MAX_PATH]; char paths[INPDEV_MAX_DEVICES][INPDEV_MAX_PATH];
int fds[INPDEV_MAX_DEVICES]; int fds[INPDEV_MAX_DEVICES];
int max_fd; int max_fd = 0;
num = 0; num = 0;
for(i = 0; i < INPDEV_MAX_DEVICES; ++i) { for(i = 0; i < INPDEV_MAX_DEVICES; ++i) {
@ -1099,8 +1099,7 @@ void record(const char *filepath, int delay, recording_mode_t mode)
while(1) while(1)
{ {
FD_ZERO(&readfds); FD_ZERO(&readfds);
if (wait_for_stdin) FD_SET(STDIN_FILENO, &readfds);
FD_SET(STDIN_FILENO, &readfds);
for (i=0; i < devices.num; i++) for (i=0; i < devices.num; i++)
FD_SET(devices.fds[i], &readfds); FD_SET(devices.fds[i], &readfds);

6
wlauto/utils/statedetect.py
View File

@ -136,9 +136,6 @@ def verify_state(screenshot_file, state_defs_path, workload_phase):
with open(statedefs_file) as fh: with open(statedefs_file) as fh:
state_definitions = yaml.load(fh) state_definitions = yaml.load(fh)
# run a match on the screenshot
matched_state = match_state(screenshot_file, state_defs_path, state_definitions)
# find what the expected state is for the given workload phase # find what the expected state is for the given workload phase
expected_state = None expected_state = None
for phase in state_definitions["workload_phases"]: for phase in state_definitions["workload_phases"]:
@ -148,4 +145,7 @@ def verify_state(screenshot_file, state_defs_path, workload_phase):
if expected_state is None: if expected_state is None:
raise StateDefinitionError("Phase not defined") raise StateDefinitionError("Phase not defined")
# run a match on the screenshot
matched_state = match_state(screenshot_file, state_defs_path, state_definitions)
return expected_state == matched_state return expected_state == matched_state