Francois Gouget : shell32/tests: Move a test_argify() check so it is run even if we could not create associations.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c1636cd27929a33e7de960902db53ff967a74dc7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c1636cd27929a33e7de960902d...

Author: Francois Gouget <fgouget(a)free.fr>
Date:   Mon Feb  8 05:26:18 2016 +0100

shell32/tests: Move a test_argify() check so it is run even if we could not create associations.

Signed-off-by: Francois Gouget <fgouget(a)free.fr>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/shell32/tests/shlexec.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 8e9325f..3cf80b6 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -1538,6 +1538,18 @@ static void test_argify(void)
     const char* cmd;
     unsigned i, count;
 
+    /* Test with a long parameter */
+    for (rc = 0; rc < MAX_PATH; rc++)
+        fileA[rc] = 'a' + rc % 26;
+    fileA[MAX_PATH-1] = '\0';
+    sprintf(params, "shlexec \"%s\" %s", child_file, fileA);
+
+    /* We need NOZONECHECKS on Win2003 to block a dialog */
+    rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL);
+    okShell(rc > 32, "failed: rc=%lu\n", rc);
+    okChildInt("argcA", 4);
+    okChildPath("argvA3", fileA);
+
     if (skip_shlexec_tests)
     {
         skip("No argify tests due to lack of .shlexec association\n");
@@ -1602,18 +1614,6 @@ static void test_argify(void)
             has_cl2a = test_one_cmdline(&(test->cmd));
         test++;
     }
-
-    /* Test with a long parameter */
-    for (rc = 0; rc < MAX_PATH; rc++)
-        fileA[rc] = 'a' + rc % 26;
-    fileA[MAX_PATH-1] = '\0';
-    sprintf(params, "shlexec \"%s\" %s", child_file, fileA);
-
-    /* We need NOZONECHECKS on Win2003 to block a dialog */
-    rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL);
-    okShell(rc > 32, "failed: rc=%lu\n", rc);
-    okChildInt("argcA", 4);
-    okChildPath("argvA3", fileA);
 }
 
 static void test_filename(void)