run-test262: when updating errors, sort them so that it gives the same result with...

diff --git a/Makefile b/Makefile
index 61e70a57aa913d80378e794c8743d9c1e26f30c9..1239e0efb8d87d8907f9c486848ca274d43c3193 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -508,7 +508,7 @@ test2: run-test262
        time ./run-test262 -t -m -c test262.conf -a
 
 test2-update: run-test262
        time ./run-test262 -t -m -c test262.conf -a
 
 test2-update: run-test262

-       ./run-test262 -t -u -c test262.conf -a -T 1
+       ./run-test262 -t -u -c test262.conf -a

 
 test2-check: run-test262
        time ./run-test262 -t -m -c test262.conf -E -a
 
 test2-check: run-test262
        time ./run-test262 -t -m -c test262.conf -E -a

diff --git a/run-test262.c b/run-test262.c
index 81811b58d1abcb3fcf212f483d5d57fd2bd03397..9d03964e4ed616241bc51281ae14a692939ea58e 100644 (file)
--- a/run-test262.c
+++ b/run-test262.c
@@ -87,6 +87,8 @@ typedef struct {
 namelist_t test_list;
 namelist_t exclude_list;
 namelist_t exclude_dir_list;
 namelist_t test_list;
 namelist_t exclude_list;
 namelist_t exclude_dir_list;

+namelist_t error_list;
+pthread_mutex_t error_list_mutex;

 
 int nthreads;
 pthread_t progress_thread;
 
 int nthreads;
 pthread_t progress_thread;


@@ -121,7 +123,6 @@ char *harness_skip_features;
 int *harness_skip_features_count;
 char *error_filename;
 char *error_file;
 int *harness_skip_features_count;
 char *error_filename;
 char *error_file;

-FILE *error_out;

 char *report_filename;
 int update_errors;
 int slow_test_threshold;
 char *report_filename;
 int update_errors;
 int slow_test_threshold;


@@ -390,20 +391,22 @@ int namelist_cmp_indirect(const void *a, const void *b)
     return namelist_cmp(*(const char **)a, *(const char **)b);
 }
 
     return namelist_cmp(*(const char **)a, *(const char **)b);
 }
 

-void namelist_sort(namelist_t *lp)
+void namelist_sort(namelist_t *lp, BOOL remove_duplicates)

 {
     int i, count;
     if (lp->count > 1) {
         qsort(lp->array, lp->count, sizeof(*lp->array), namelist_cmp_indirect);
         /* remove duplicates */
 {
     int i, count;
     if (lp->count > 1) {
         qsort(lp->array, lp->count, sizeof(*lp->array), namelist_cmp_indirect);
         /* remove duplicates */

-        for (count = i = 1; i < lp->count; i++) {
-            if (namelist_cmp(lp->array[count - 1], lp->array[i]) == 0) {
-                free(lp->array[i]);
-            } else {
-                lp->array[count++] = lp->array[i];
+        if (remove_duplicates) {
+            for (count = i = 1; i < lp->count; i++) {
+                if (namelist_cmp(lp->array[count - 1], lp->array[i]) == 0) {
+                    free(lp->array[i]);
+                } else {
+                    lp->array[count++] = lp->array[i];
+                }

             }
             }

+            lp->count = count;

         }
         }

-        lp->count = count;

     }
 }
 
     }
 }
 


@@ -1077,7 +1080,7 @@ void update_exclude_dirs(void)
     }
     ep->count = count;
 
     }
     ep->count = count;
 

-    namelist_sort(dp);
+    namelist_sort(dp, TRUE);

 
     /* filter out excluded directories */
     for (count = i = 0; i < lp->count; i++) {
 
     /* filter out excluded directories */
     for (count = i = 0; i < lp->count; i++) {


@@ -1358,6 +1361,22 @@ int longest_match(const char *str, const char *find, int pos, int *ppos, int lin
     return maxlen;
 }
 
     return maxlen;
 }
 

+static __attribute__((__format__(__printf__, 1, 2))) void print_error(const char *fmt, ...)
+{
+    char buf[1024];
+    va_list ap;
+    va_start(ap, fmt);
+    vsnprintf(buf, sizeof(buf), fmt, ap);
+    va_end(ap);
+    if (update_errors) {
+        pthread_mutex_lock(&error_list_mutex);
+        namelist_add(&error_list, NULL, buf);
+        pthread_mutex_unlock(&error_list_mutex);
+    } else {
+        fputs(buf, stdout);
+    }
+}
+

 static int eval_buf(JSContext *ctx, const char *buf, size_t buf_len,
                     const char *filename, int is_test, int is_negative,
                     const char *error_type, FILE *outfile, int eval_flags,
 static int eval_buf(JSContext *ctx, const char *buf, size_t buf_len,
                     const char *filename, int is_test, int is_negative,
                     const char *error_type, FILE *outfile, int eval_flags,


@@ -1505,11 +1524,11 @@ static int eval_buf(JSContext *ctx, const char *buf, size_t buf_len,
             } else {
                 if (!s) {   // not yet reported
                     if (msg) {
             } else {
                 if (!s) {   // not yet reported
                     if (msg) {

-                        fprintf(error_out, "%s:%d: %sunexpected error type: %s\n",
-                                filename, error_line, strict_mode, msg);
+                        print_error("%s:%d: %sunexpected error type: %s\n",
+                                    filename, error_line, strict_mode, msg);

                     } else {
                     } else {

-                        fprintf(error_out, "%s:%d: %sexpected error\n",
-                                filename, error_line, strict_mode);
+                        print_error("%s:%d: %sexpected error\n",
+                                    filename, error_line, strict_mode);

                     }
                     new_errors++;
                 }
                     }
                     new_errors++;
                 }


@@ -1525,8 +1544,8 @@ static int eval_buf(JSContext *ctx, const char *buf, size_t buf_len,
                             longest_match(buf, p, pos, &pos, pos_line, &error_line);
                         }
                     }
                             longest_match(buf, p, pos, &pos, pos_line, &error_line);
                         }
                     }

-                    fprintf(error_out, "%s:%d: %s%s%s\n", filename, error_line, strict_mode,
-                            error_file ? "unexpected error: " : "", msg);
+                    print_error("%s:%d: %s%s%s\n", filename, error_line, strict_mode,
+                                error_file ? "unexpected error: " : "", msg);

 
                     if (s && (!str_equal(s, msg) || error_line != s_line)) {
                         printf("%s:%d: %sprevious error: %s\n", filename, s_line, strict_mode, s);
 
                     if (s && (!str_equal(s, msg) || error_line != s_line)) {
                         printf("%s:%d: %sprevious error: %s\n", filename, s_line, strict_mode, s);


@@ -2244,6 +2263,7 @@ int main(int argc, char **argv)
     
     init_thread_local_storage(tls);
     pthread_mutex_init(&stats_mutex, NULL);
     
     init_thread_local_storage(tls);
     pthread_mutex_init(&stats_mutex, NULL);

+    pthread_mutex_init(&error_list_mutex, NULL);

 
 #if !defined(_WIN32)
     compact = !isatty(STDERR_FILENO);
 
 #if !defined(_WIN32)
     compact = !isatty(STDERR_FILENO);


@@ -2338,7 +2358,6 @@ int main(int argc, char **argv)
     }
     nthreads = max_int(nthreads, 1);
 
     }
     nthreads = max_int(nthreads, 1);
 

-    error_out = stdout;

     if (error_filename) {
         error_file = load_file(error_filename, NULL);
         if (only_check_errors && error_file) {
     if (error_filename) {
         error_file = load_file(error_filename, NULL);
         if (only_check_errors && error_file) {


@@ -2348,10 +2367,6 @@ int main(int argc, char **argv)
         if (update_errors) {
             free(error_file);
             error_file = NULL;
         if (update_errors) {
             free(error_file);
             error_file = NULL;

-            error_out = fopen(error_filename, "w");
-            if (!error_out) {
-                perror_exit(1, error_filename);
-            }

         }
     }
 
         }
     }
 


@@ -2397,8 +2412,8 @@ int main(int argc, char **argv)
         }
 
         // exclude_dir_list has already been sorted by update_exclude_dirs()
         }
 
         // exclude_dir_list has already been sorted by update_exclude_dirs()

-        namelist_sort(&test_list);
-        namelist_sort(&exclude_list);
+        namelist_sort(&test_list, TRUE);
+        namelist_sort(&exclude_list, TRUE);

         
         for (i = 0; i < test_list.count; i++) {
             switch (include_exclude_or_skip(i)) {
         
         for (i = 0; i < test_list.count; i++) {
             switch (include_exclude_or_skip(i)) {


@@ -2509,14 +2524,25 @@ int main(int argc, char **argv)
             fprintf(stderr, "Total user time: %.3fs (nthreads=%d)\n", (double)clocks / CLOCKS_PER_SEC, nthreads);
     }
 
             fprintf(stderr, "Total user time: %.3fs (nthreads=%d)\n", (double)clocks / CLOCKS_PER_SEC, nthreads);
     }
 

-    if (error_out && error_out != stdout) {
+    if (update_errors) {
+        FILE *error_out = fopen(error_filename, "w");
+        int i;
+        if (!error_out) {
+            perror_exit(1, error_filename);
+        }
+        /* sort the error list so that its order does not depend on
+           the thread scheduling */
+        namelist_sort(&error_list, FALSE);
+        for (i = 0; i < error_list.count; i++) {
+            fputs(error_list.array[i], error_out);
+        }

         fclose(error_out);
         fclose(error_out);

-        error_out = NULL;

     }
 
     namelist_free(&test_list);
     namelist_free(&exclude_list);
     namelist_free(&exclude_dir_list);
     }
 
     namelist_free(&test_list);
     namelist_free(&exclude_list);
     namelist_free(&exclude_dir_list);

+    namelist_free(&error_list);

     free(harness_dir);
     free(harness_skip_features);
     free(harness_skip_features_count);
     free(harness_dir);
     free(harness_skip_features);
     free(harness_skip_features_count);