From 02f02a41e60e0ba7b1b699cc262b57b889ed75f0 Mon Sep 17 00:00:00 2001 From: Glavin Wiechert Date: Fri, 1 Apr 2016 17:22:12 -0300 Subject: [PATCH] Resolve failing tests with updated dependencies --- .../html/expected/test.html | 18 +-- .../html/expected/test.html | 18 +-- .../html/expected/unformatted_elements.html | 21 ++-- .../less/expected/test2.less | 8 +- .../opencl/expected/test.cl | 108 +++++++++--------- .../html/expected/test.html | 18 +-- 6 files changed, 94 insertions(+), 97 deletions(-) diff --git a/examples/editorconfig-options/html/expected/test.html b/examples/editorconfig-options/html/expected/test.html index 36948e6..1a8d72c 100644 --- a/examples/editorconfig-options/html/expected/test.html +++ b/examples/editorconfig-options/html/expected/test.html @@ -1,15 +1,15 @@ - - Test Page - + + Test Page + - -

Hello

-

- World! -

- + +

Hello

+

+ World! +

+ \ No newline at end of file diff --git a/examples/nested-jsbeautifyrc/html/expected/test.html b/examples/nested-jsbeautifyrc/html/expected/test.html index 1ff72f3..ac3afff 100644 --- a/examples/nested-jsbeautifyrc/html/expected/test.html +++ b/examples/nested-jsbeautifyrc/html/expected/test.html @@ -1,15 +1,15 @@ - - Test Page - + + Test Page + - -

Hello

-

- World! -

- + +

Hello

+

+ World! +

+ \ No newline at end of file diff --git a/examples/nested-jsbeautifyrc/html/expected/unformatted_elements.html b/examples/nested-jsbeautifyrc/html/expected/unformatted_elements.html index ebc90ef..4326fc6 100644 --- a/examples/nested-jsbeautifyrc/html/expected/unformatted_elements.html +++ b/examples/nested-jsbeautifyrc/html/expected/unformatted_elements.html @@ -1,13 +1,14 @@ - - Test - - - - \ No newline at end of file + + + Test + + + + + + \ No newline at end of file diff --git a/examples/nested-jsbeautifyrc/less/expected/test2.less b/examples/nested-jsbeautifyrc/less/expected/test2.less index 7e02e07..2a4eacc 100644 --- a/examples/nested-jsbeautifyrc/less/expected/test2.less +++ b/examples/nested-jsbeautifyrc/less/expected/test2.less @@ -1,6 +1,6 @@ // main: style.less -@import (reference)"variables.less"; -@import (reference)"mixins.less"; +@import (reference) "variables.less"; +@import (reference) "mixins.less"; .modal { position: fixed; @@ -109,7 +109,6 @@ .slideIn { .animation(SlideIn, 0.5s); } - @-webkit-keyframes SlideIn { 0% { .transform(translateY(-100%)); @@ -124,7 +123,6 @@ display: block; .animation(FadeIn, 0.5s); } - @-webkit-keyframes FadeIn { 0% { opacity: 0; @@ -138,7 +136,6 @@ .slideOut { .animation(SlideOut, 0.5s); } - @-webkit-keyframes SlideOut { 0% { .transform(translateY(0%)); @@ -152,7 +149,6 @@ .fadeOut { .animation(FadeOut, 0.5s); } - @-webkit-keyframes FadeOut { 0% { opacity: 1; diff --git a/examples/nested-jsbeautifyrc/opencl/expected/test.cl b/examples/nested-jsbeautifyrc/opencl/expected/test.cl index 546cf9a..ae404f6 100644 --- a/examples/nested-jsbeautifyrc/opencl/expected/test.cl +++ b/examples/nested-jsbeautifyrc/opencl/expected/test.cl @@ -1,77 +1,77 @@ __kernel void reduce_min(__global const int* A, __global int* B, __local int* scratch) { - //Get local variable data - int id = get_global_id(0); - int lid = get_local_id(0); - int N = get_local_size(0); + //Get local variable data + int id = get_global_id(0); + int lid = get_local_id(0); + int N = get_local_size(0); - //Store valus of global memory into local memory - scratch[lid] = A[id]; + //Store valus of global memory into local memory + scratch[lid] = A[id]; - //Wait for copying to complete - barrier(CLK_LOCAL_MEM_FENCE); + //Wait for copying to complete + barrier(CLK_LOCAL_MEM_FENCE); - for (int i = 1; i < N; i *= 2) { - if (!(lid % (i * 2)) && ((lid + i) < N)){ - if (scratch[lid] > scratch[lid + i]) - scratch[lid] = scratch[lid+i]; + for (int i = 1; i < N; i *= 2) { + if (!(lid % (i * 2)) && ((lid + i) < N)) { + if (scratch[lid] > scratch[lid + i]) + scratch[lid] = scratch[lid+i]; + } + + barrier(CLK_LOCAL_MEM_FENCE); } - barrier(CLK_LOCAL_MEM_FENCE); - } - - //Store cache in output array - if (!lid) - atomic_min(&B[0], scratch[lid]); + //Store cache in output array + if (!lid) + atomic_min(&B[0], scratch[lid]); } __kernel void reduce_max(__global const int* A, __global int* B, __local int* scratch) { - //Get local variable data - int id = get_global_id(0); - int lid = get_local_id(0); - int N = get_local_size(0); + //Get local variable data + int id = get_global_id(0); + int lid = get_local_id(0); + int N = get_local_size(0); - //Store valus of global memory into local memory - scratch[lid] = A[id]; + //Store valus of global memory into local memory + scratch[lid] = A[id]; - //Wait for copying to complete - barrier(CLK_LOCAL_MEM_FENCE); + //Wait for copying to complete + barrier(CLK_LOCAL_MEM_FENCE); - for (int i = 1; i < N; i *= 2) { - if (!(lid % (i * 2)) && ((lid + i) < N)){ - if (scratch[lid] < scratch[lid + i]) - scratch[lid] = scratch[lid+i]; + for (int i = 1; i < N; i *= 2) { + if (!(lid % (i * 2)) && ((lid + i) < N)) { + if (scratch[lid] < scratch[lid + i]) + scratch[lid] = scratch[lid+i]; + } + + barrier(CLK_LOCAL_MEM_FENCE); } - barrier(CLK_LOCAL_MEM_FENCE); - } - - //Store cache in output array - if (!lid) - atomic_max(&B[0], scratch[lid]); + //Store cache in output array + if (!lid) + atomic_max(&B[0], scratch[lid]); } __kernel void reduce_avg(__global const int* A, __global int* B, __local int* scratch) { - //Get local variable data - int id = get_global_id(0); - int lid = get_local_id(0); - int N = get_local_size(0); + //Get local variable data + int id = get_global_id(0); + int lid = get_local_id(0); + int N = get_local_size(0); - //Store valus of global memory into local memory - scratch[lid] = A[id]; + //Store valus of global memory into local memory + scratch[lid] = A[id]; - //Wait for copying to complete - barrier(CLK_LOCAL_MEM_FENCE); + //Wait for copying to complete + barrier(CLK_LOCAL_MEM_FENCE); - for (int i = 1; i < N; i *= 2) { - if (!(lid % (i * 2)) && ((lid + i) < N)) - { - scratch[lid] += scratch[lid+i]; - } - barrier(CLK_LOCAL_MEM_FENCE); - } + for (int i = 1; i < N; i *= 2) { + if (!(lid % (i * 2)) && ((lid + i) < N)) + { + scratch[lid] += scratch[lid+i]; + } + barrier(CLK_LOCAL_MEM_FENCE); + } - //Store cache in output array - if (!lid) - atomic_add(&B[0],scratch[lid]); + //Store cache in output array + if (!lid) + atomic_add(&B[0],scratch[lid]); } diff --git a/examples/simple-jsbeautifyrc/html/expected/test.html b/examples/simple-jsbeautifyrc/html/expected/test.html index 1ff72f3..ac3afff 100644 --- a/examples/simple-jsbeautifyrc/html/expected/test.html +++ b/examples/simple-jsbeautifyrc/html/expected/test.html @@ -1,15 +1,15 @@ - - Test Page - + + Test Page + - -

Hello

-

- World! -

- + +

Hello

+

+ World! +

+ \ No newline at end of file