win32: Enable exactness

configure.bat

@@ -139,6 +139,7 @@ exit /B 0
             -Dlibmount=false^
             "-Devas-loaders-disabler=gst,pdf,ps,raw,svg,rsvg,xcf,bmp,dds,generic,gif,ico,jp2k,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm,json"^
             -Dopengl=none^
+            -Dexactness-win32=true^
             "-Demotion-loaders-disabler=gstreamer1,libvlc,xine"^
             -Dbindings=^
             --buildtype=debug^

meson.build

@@ -225,6 +225,9 @@ foreach lang : ['c', 'objc', 'cpp']
       error('Version of targetted Windows incorrect')
     endif
     add_global_arguments('-D__USE_MINGW_ANSI_STDIO', language: lang)
+    if get_option('exactness-win32')
+      add_global_arguments('-DEFL_EXACTNESS_WIN32', language: lang)
+    endif
   endif
 endforeach
 
@@ -495,13 +498,14 @@ subprojects = [
 if sys_windows
   ignored_subprojects = [
     # temporarily ignored
-    'exactness',
   ]
+  if get_option('exactness-win32') == false
+    ignored_subprojects += ['exactness']
+  endif
 else
   ignored_subprojects = []
 endif
 
-
 _subprojects = []
 foreach package : subprojects
   package_name = package[0]

meson_options.txt

@@ -344,6 +344,12 @@ option('dotnet',
   description: 'Enable building C# bindings with dotnet instead of mono'
 )
 
+option('exactness-win32',
+  type: 'boolean',
+  value: false,
+  description: 'Enable building Exactness on Windows'
+)
+
 option('lua-interpreter',
   type: 'combo',
   choices: ['luajit', 'lua'],

src/bin/exactness/exactness.c

@@ -10,7 +10,9 @@
 #include "common.h"
 
 #ifdef _WIN32
-# include <evil_private.h> /* mkdir */
+# include <evil_private.h> /* mkdir, dirname */
+#else
+# include <libgen.h>
 #endif
 
 #define SCHEDULER_CMD_SIZE 1024
@@ -44,6 +46,7 @@ typedef enum
 static unsigned short _running_jobs = 0, _max_jobs = 1;
 static Eina_List *_base_dirs = NULL;
 static char *_dest_dir;
+static char dest_dir[PATH_MAX];
 static char *_wrap_command = NULL, *_fonts_dir = NULL;
 static int _verbose = 0;
 static Eina_Bool _scan_objs = EINA_FALSE, _disable_screenshots = EINA_FALSE, _stabilize_shots = EINA_FALSE;
@@ -110,17 +113,17 @@ _file_compare(const char *orig_dir, const char *ent_name)
    Eina_Bool result = EINA_FALSE;
    Exactness_Image *img1, *img2, *imgO = NULL;
    char *filename1 = alloca(strlen(orig_dir) + strlen(ent_name) + 20);
-   char *filename2 = alloca(strlen(_dest_dir) + strlen(ent_name) + 20);
+   char *filename2 = alloca(strlen(dest_dir) + strlen(ent_name) + 20);
    sprintf(filename1, "%s/%s", orig_dir, ent_name);
-   sprintf(filename2, "%s/%s/%s", _dest_dir, CURRENT_SUBDIR, ent_name);
+   sprintf(filename2, "%s/%s/%s", dest_dir, CURRENT_SUBDIR, ent_name);
 
    img1 = _image_load(filename1);
    img2 = _image_load(filename2);
 
    if (exactness_image_compare(img1, img2, &imgO))
      {
-        char *buf = alloca(strlen(_dest_dir) + strlen(ent_name));
-        sprintf(buf, "%s/%s/comp_%s", _dest_dir, CURRENT_SUBDIR, ent_name);
+        char *buf = alloca(strlen(dest_dir) + strlen(ent_name));
+        sprintf(buf, "%s/%s/comp_%s", dest_dir, CURRENT_SUBDIR, ent_name);
         if (!_image_save(imgO, buf))
           goto cleanup;
         _compare_errors = eina_list_append(_compare_errors, strdup(ent_name));
@@ -164,7 +167,7 @@ static void
 _run_test_compare(const List_Entry *ent)
 {
    char *path = alloca(PATH_MAX);
-   char *origdir = alloca(strlen(_dest_dir) + 20);
+   char *origdir = alloca(strlen(dest_dir) + 20);
    const char *base_dir;
    Eina_List *itr;
    int n = 1, nb_fails = 0;
@@ -175,7 +178,7 @@ _run_test_compare(const List_Entry *ent)
         if (ecore_file_exists(path))
           {
              char *currentdir;
-             sprintf(origdir, "%s/%s/%s", _dest_dir, CURRENT_SUBDIR, ORIG_SUBDIR);
+             sprintf(origdir, "%s/%s/%s", dest_dir, CURRENT_SUBDIR, ORIG_SUBDIR);
              if (!ecore_file_exists(origdir))
                {
                   if (mkdir(origdir, 0744) < 0)
@@ -185,9 +188,10 @@ _run_test_compare(const List_Entry *ent)
                     }
                }
              _exu_imgs_unpack(path, origdir, ent->name);
-             sprintf(path, "%s/%s/%s.exu", _dest_dir, CURRENT_SUBDIR, ent->name);
-             currentdir = alloca(strlen(_dest_dir) + 20);
-             sprintf(currentdir, "%s/%s", _dest_dir, CURRENT_SUBDIR);
+             sprintf(path, "%s/%s/%s.exu", dest_dir, CURRENT_SUBDIR, ent->name);
+             currentdir = alloca(strlen(dest_dir) + 20);
+             sprintf(currentdir, "%s/%s", dest_dir, CURRENT_SUBDIR);
+
              _exu_imgs_unpack(path, currentdir, ent->name);
              goto found;
           }
@@ -228,9 +232,13 @@ _run_command_prepare(const List_Entry *ent, char *buf)
 ok:
    sbuf = eina_strbuf_new();
    printf("STATUS %s: START\n", ent->name);
+
+   if (_wrap_command)
+       eina_strbuf_append_printf(sbuf, "%s", _wrap_command);
+
    eina_strbuf_append_printf(sbuf,
-         "%s exactness_play %s %s%s %s%.*s %s%s%s-t '%s' ",
-         _wrap_command ? _wrap_command : "",
+         "python %s/exactness_play.py %s %s%s %s%.*s %s%s%s-t \"%s\" ",
+	     PACKAGE_BIN_DIR,
          _mode == RUN_SIMULATION ? "-s" : "",
          _fonts_dir ? "-f " : "", _fonts_dir ? _fonts_dir : "",
          _verbose ? "-" : "", _verbose, "vvvvvvvvvv",
@@ -241,12 +249,13 @@ _run_command_prepare(const List_Entry *ent, char *buf)
          );
 
    if (_mode == RUN_PLAY)
-      eina_strbuf_append_printf(sbuf, "-o '%s/%s/%s.exu' ", _dest_dir, CURRENT_SUBDIR, ent->name);
+      eina_strbuf_append_printf(sbuf, "-o \"%s/%s/%s.exu\" ", dest_dir, CURRENT_SUBDIR, ent->name);
    if (_mode == RUN_INIT)
-      eina_strbuf_append_printf(sbuf, "-o '%s' ", scn_path);
+      eina_strbuf_append_printf(sbuf, "-o \"%s\" ", scn_path);
 
    if (ent->command)
      {
+
         eina_strbuf_append(sbuf, "-- ");
         eina_strbuf_append(sbuf, CONFIG);
         eina_strbuf_append(sbuf, ent->command);
@@ -345,6 +354,9 @@ _list_file_load(const char *filename)
         return NULL;
      }
 
+   char *_test_file_dir = realpath(filename, NULL);
+   _test_file_dir = dirname(_test_file_dir);
+
    while (fgets(buf, BUF_SIZE, file))
      {
         /* Skip comment/empty lines. */
@@ -360,7 +372,9 @@ _list_file_load(const char *filename)
         if (tmp)
           {
              *tmp = '\0';
-             cur->command = tmp + 1;
+	     char *command;
+	     asprintf(&command, "%s/%s", _test_file_dir, tmp + 1);
+             cur->command = command;
           }
         else
           {
@@ -380,6 +394,8 @@ _list_file_load(const char *filename)
               List_Entry);
      }
 
+   free(_test_file_dir);
+
    fclose(file);
    return ret;
 }
@@ -497,11 +513,15 @@ main(int argc, char *argv[])
      ECORE_GETOPT_VALUE_NONE
    };
 
+   // Force to use the buffer engine
+   setenv("ELM_DISPLAY", "buffer", 1);
+   setenv("ECORE_EVAS_ENGINE", "buffer", 1);
+
    if (!ecore_evas_init())
       return EXIT_FAILURE;
 
    _log_domain = eina_log_domain_register("exactness", "red");
-   _dest_dir = "./";
+   _dest_dir = ".";
    _scan_objs = scan_objs;
 
    eina_log_abort_on_critical_set(EINA_TRUE);
@@ -549,19 +569,28 @@ main(int argc, char *argv[])
         goto end;
      }
 
+   /* Get absolute path for all parameters */
+   EINA_LIST_FOREACH(_base_dirs, itr, base_dir)
+     {
+        char _resolved_base_dir[PATH_MAX];
+        realpath(base_dir, _resolved_base_dir);
+        eina_list_data_set(itr, _resolved_base_dir);
+     }
+   realpath(_dest_dir, dest_dir);
+
    /* Pre-run summary */
    fprintf(stderr, "Running with settings:\n");
    fprintf(stderr, "\tConcurrent jobs: %d\n", _max_jobs);
    fprintf(stderr, "\tTest list file: %s\n", list_file);
    fprintf(stderr, "\tBase dirs:\n");
    EINA_LIST_FOREACH(_base_dirs, itr, base_dir)
       fprintf(stderr, "\t\t%s\n", base_dir);
-   fprintf(stderr, "\tDest dir: %s\n", _dest_dir);
+   fprintf(stderr, "\tDest dir: %s\n", dest_dir);
 
    if (mode_play)
      {
         _mode = RUN_PLAY;
-        if (snprintf(tmp, PATH_MAX, "%s/%s", _dest_dir, CURRENT_SUBDIR)
+        if (snprintf(tmp, PATH_MAX, "%s/%s", dest_dir, CURRENT_SUBDIR)
             >= PATH_MAX)
           {
              fprintf(stderr, "Path too long: %s", tmp);
@@ -581,7 +610,7 @@ main(int argc, char *argv[])
    else if (mode_init)
      {
         _mode = RUN_INIT;
-        if (snprintf(tmp, PATH_MAX, "%s/%s", _dest_dir, ORIG_SUBDIR)
+        if (snprintf(tmp, PATH_MAX, "%s/%s", dest_dir, ORIG_SUBDIR)
             >= PATH_MAX)
           {
              fprintf(stderr, "Path too long: %s", tmp);
@@ -637,7 +666,7 @@ main(int argc, char *argv[])
         /* Generate the filename. */
         snprintf(report_filename, PATH_MAX,
               "%s/%s/errors.html",
-              _dest_dir, mode_init ? ORIG_SUBDIR : CURRENT_SUBDIR);
+              dest_dir, mode_init ? ORIG_SUBDIR : CURRENT_SUBDIR);
         report_file = fopen(report_filename, "w+");
         if (report_file)
           {
@@ -671,7 +700,7 @@ main(int argc, char *argv[])
                        Eina_Bool is_from_exu;
                        char origpath[PATH_MAX];
                        snprintf(origpath, PATH_MAX, "%s/%s/orig/%s",
-                             _dest_dir, CURRENT_SUBDIR, test_name);
+                             dest_dir, CURRENT_SUBDIR, test_name);
                        is_from_exu = ecore_file_exists(origpath);
                        printf("\t* %s\n", test_name);
 

src/bin/exactness/exactness_play.in

@@ -48,7 +48,11 @@ if G.version:
   exit(0)
 
 spawn_env = os.environ.copy()
-spawn_env["LD_PRELOAD"] = @EXACTNESS_PLAY_PRELOAD_PATH@
+if os.name == 'nt':
+  # Windows
+  spawn_env["EXACTNESS_PRELOAD_WIN32"] = "PLAY"
+else:
+  spawn_env["LD_PRELOAD"] = @EXACTNESS_PLAY_PRELOAD_PATH@
 
 if G.tests == None and G.external_injection == True:
   print("no test file specified")
@@ -69,7 +73,7 @@ if G.tests != None:
 if G.fontsdir != None:
   spawn_env["EXACTNESS_FONTS_DIR"] = G.fontsdir
 if G.speed != 1.0:
-  spawn_env["EXACTNESS_SPEED"] = G.speed
+  spawn_env["EXACTNESS_SPEED"] = str(G.speed)
 if G.scan_objects:
   spawn_env["EXACTNESS_SCAN_OBJECTS"] = "Yes"
 if G.disable_screenshots:
@@ -80,6 +84,7 @@ if G.verbose:
   spawn_env["EXACTNESS_VERBOSE"] = "Yes"
 if G.show_on_screen == False:
   spawn_env["ELM_DISPLAY"] = "buffer"
+  spawn_env["ECORE_EVAS_ENGINE"] = "buffer"
 
 passed_all_the_env_vars = False
 app = []
@@ -97,5 +102,6 @@ for argument in G.app:
   if passed_all_the_env_vars:
     app.append(argument)
 
-recorder = subprocess.Popen(app, env=spawn_env)
-recorder.wait()
+with subprocess.Popen(app, env=spawn_env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) as p:
+    for line in p.stdout:
+        print(line, end='')

src/bin/exactness/exactness_record.in

@@ -45,7 +45,11 @@ if G.version:
   exit(0)
 
 spawn_env = os.environ.copy()
-spawn_env["LD_PRELOAD"] = @EXACTNESS_RECORD_PRELOAD_PATH@
+if os.name == 'nt':
+  # Windows
+  spawn_env["EXACTNESS_PRELOAD_WIN32"] = "RECORD"
+else:
+  spawn_env["LD_PRELOAD"] = @EXACTNESS_PLAY_PRELOAD_PATH@
 
 if G.tests != None:
   spawn_env["EXACTNESS_DEST"] = G.tests
@@ -72,5 +76,6 @@ for argument in G.app:
   if passed_all_the_env_vars:
     app.append(argument)
 
-recorder = subprocess.Popen(app, env=spawn_env)
-recorder.wait()
+with subprocess.Popen(app, env=spawn_env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) as p:
+    for line in p.stdout:
+        print(line, end='')

src/bin/exactness/meson.build

@@ -23,44 +23,58 @@ edjs = custom_target('player_entry',
   input : 'player_entry.edc',
   output : 'player_entry.edj',
   install : true,
-  install_dir : 'share/exactness',
+  install_dir : join_paths('share', 'exactness'),
   command : edje_cc_exe + [
     '-id', join_paths(meson.source_root(), 'data', 'elementary', 'themes', 'img'),
     '-sd', join_paths(meson.source_root(), 'data', 'elementary', 'themes', 'snd'),
+    '-in-tree',
     '@INPUT@', '@OUTPUT@'],
   depends : edje_depends)
 
-exactness_play_bin = library('exactness_play',
+exactness_play_lib = library('exactness_play',
   [ 'player.c', 'common.c', 'common.h', edjs ],
   dependencies: [ elementary, dl],
   c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"',
   install: true,
   version : meson.project_version()
 )
 
-exactness_record_bin = library('exactness_record',
+exactness_record_deps = [ elementary, dl]
+if sys_windows
+  winmm = cc.find_library('winmm')
+  exactness_record_deps += winmm
+endif
+
+exactness_record_lib = library('exactness_record',
   [ 'recorder.c', 'common.c', 'common.h' ],
-  dependencies: [ elementary, dl],
+  dependencies: exactness_record_deps,
   c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"',
   install: true,
   version : meson.project_version()
 )
 
+exactness_play_lib_path = join_paths(
+  get_option('prefix'), get_option('libdir'),
+  'lib' + exactness_play_lib.name() + '.so.' + meson.project_version() )
+exactness_record_lib_path = join_paths(
+  get_option('prefix'), get_option('libdir'),
+  'lib' + exactness_record_lib.name() + '.so.' + meson.project_version() )
+
 exactness_env = configuration_data()
-exactness_env.set_quoted('EXACTNESS_PLAY_PRELOAD_PATH', exactness_play_bin.full_path())
-exactness_env.set_quoted('EXACTNESS_RECORD_PRELOAD_PATH', exactness_record_bin.full_path())
+exactness_env.set_quoted('EXACTNESS_PLAY_PRELOAD_PATH', exactness_play_lib_path)
+exactness_env.set_quoted('EXACTNESS_RECORD_PRELOAD_PATH', exactness_record_lib_path)
 exactness_env.set_quoted('VERSION', meson.project_version())
 
 configure_file(
   input: 'exactness_record.in',
-  output: 'exactness_record',
+  output: 'exactness_record.py',
   configuration: exactness_env,
   install_dir: get_option('bindir'),
   install_mode: 'rwxr-xr-x')
 
 configure_file(
   input: 'exactness_play.in',
-  output: 'exactness_play',
+  output: 'exactness_play.py',
   configuration: exactness_env,
   install_dir: get_option('bindir'),
   install_mode: 'rwxr-xr-x')