aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Gohman <sunfish@google.com>2014-02-24 08:46:38 -0800
committerDan Gohman <sunfish@google.com>2014-02-25 11:58:53 -0800
commit3317f2cd793893073619a87a462da26c505ba9eb (patch)
tree89929a716269220d19aa3c4b6d2cd8bbe13343b7
parentc600155b1fef26a248d6467a89030328db0fedab (diff)
Use __EMSCRIPTEN__ instead of EMSCRIPTEN in tests.
-rw-r--r--tests/799.cpp2
-rw-r--r--tests/aniso.c2
-rw-r--r--tests/box2d/Benchmark.cpp8
-rw-r--r--tests/cube_explosion.c4
-rw-r--r--tests/cubegeom.c4
-rw-r--r--tests/cubegeom_color.c6
-rw-r--r--tests/cubegeom_color2.c4
-rw-r--r--tests/cubegeom_fog.c4
-rw-r--r--tests/cubegeom_glew.c2
-rw-r--r--tests/cubegeom_mt.c4
-rw-r--r--tests/cubegeom_normal.c4
-rw-r--r--tests/cubegeom_normal_dap.c4
-rw-r--r--tests/cubegeom_normal_dap_far.c4
-rw-r--r--tests/cubegeom_normal_dap_far_glda.c4
-rw-r--r--tests/cubegeom_normal_dap_far_glda_quad.c4
-rw-r--r--tests/cubegeom_normal_dap_far_range.c4
-rw-r--r--tests/cubegeom_pre.c4
-rw-r--r--tests/cubegeom_pre2.c4
-rw-r--r--tests/cubegeom_pre2_vao.c4
-rw-r--r--tests/cubegeom_pre2_vao2.c4
-rw-r--r--tests/cubegeom_pre3.c4
-rw-r--r--tests/cubegeom_pre_vao.c4
-rw-r--r--tests/cubegeom_proc.c4
-rw-r--r--tests/cubegeom_texturematrix.c4
-rw-r--r--tests/gl_matrix_identity.c6
-rw-r--r--tests/gl_ps.c6
-rw-r--r--tests/gl_ps_packed.c6
-rw-r--r--tests/gl_ps_strides.c6
-rw-r--r--tests/gl_renderers.c6
-rw-r--r--tests/gl_stride.c6
-rw-r--r--tests/gl_vertex_buffer.c6
-rw-r--r--tests/gl_vertex_buffer_pre.c6
-rw-r--r--tests/glbegin_points.c2
-rw-r--r--tests/glgettexenv.c2
-rw-r--r--tests/module/test_stdin.c4
-rw-r--r--tests/nbody-java/native_java_lang_String.c4
-rw-r--r--tests/nbody-java/native_java_lang_System.c2
-rw-r--r--tests/nbody-java/xmlvm.c4
-rw-r--r--tests/nbody-java/xmlvm.h2
-rw-r--r--tests/openal_buffers.c8
-rw-r--r--tests/openal_playback.cpp8
-rw-r--r--tests/perspective.c6
-rw-r--r--tests/poppler/utils/pdftoppm.cc2
-rwxr-xr-xtests/runner.py2
-rw-r--r--tests/s3tc.c2
-rw-r--r--tests/s3tc_crunch.c2
-rw-r--r--tests/sdl_alloctext.c2
-rw-r--r--tests/sdl_audio_beep.cpp8
-rw-r--r--tests/sdl_audio_mix_channels.c2
-rw-r--r--tests/sdl_canvas.c2
-rw-r--r--tests/sdl_canvas_size.c6
-rw-r--r--tests/sdl_canvas_twice.c2
-rw-r--r--tests/sdl_fog_density.c2
-rw-r--r--tests/sdl_fog_exp2.c2
-rw-r--r--tests/sdl_fog_linear.c2
-rw-r--r--tests/sdl_fog_negative.c2
-rw-r--r--tests/sdl_fog_simple.c2
-rw-r--r--tests/sdl_gfx_primitives.c4
-rw-r--r--tests/sdl_headless.c2
-rw-r--r--tests/sdl_ogl.c2
-rw-r--r--tests/sdl_ogl_defaultMatrixMode.c2
-rw-r--r--tests/sdl_ogl_p.c2
-rw-r--r--tests/sdl_ogl_proc_alias.c2
-rw-r--r--tests/sdl_rotozoom.c4
-rw-r--r--tests/sdl_swsurface.c2
-rw-r--r--tests/sdlglshader.c2
-rw-r--r--tests/sockets/test_enet_client.c10
-rw-r--r--tests/sockets/test_enet_server.c8
-rw-r--r--tests/sockets/test_getaddrinfo.c2
-rw-r--r--tests/sockets/test_gethostbyname.c2
-rw-r--r--tests/sockets/test_getnameinfo.c4
-rw-r--r--tests/sockets/test_sockets_echo_client.c6
-rw-r--r--tests/sockets/test_sockets_echo_server.c4
-rw-r--r--tests/sockets/test_sockets_partial_client.c6
-rw-r--r--tests/sockets/test_sockets_partial_server.c4
-rw-r--r--tests/sockets/test_sockets_select_server_closes_connection_client_rw.c6
-rw-r--r--tests/sockets/test_sockets_select_server_down_client.c6
-rw-r--r--tests/sockets/test_sockets_select_server_down_server.c4
-rw-r--r--tests/sockets/webrtc_host.c6
-rw-r--r--tests/sockets/webrtc_peer.c4
-rw-r--r--tests/sqlite/sqlite3.c8
-rw-r--r--tests/stat/test_mknod.c2
-rw-r--r--tests/stat/test_stat.c12
-rw-r--r--tests/test_float_literals.cpp4
-rw-r--r--tests/tex_nonbyte.c6
-rw-r--r--tests/unistd/unlink.c4
-rw-r--r--tests/uuid/test.c2
87 files changed, 179 insertions, 179 deletions
diff --git a/tests/799.cpp b/tests/799.cpp
index 6c4c9b18..aa3213af 100644
--- a/tests/799.cpp
+++ b/tests/799.cpp
@@ -6,7 +6,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
#include <arpa/inet.h>
#endif
diff --git a/tests/aniso.c b/tests/aniso.c
index 443e50aa..b925149d 100644
--- a/tests/aniso.c
+++ b/tests/aniso.c
@@ -208,7 +208,7 @@ int main(int argc, char *argv[])
*/
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
// Wait for 3 seconds to give us a chance to see the image
SDL_Delay(2000);
#endif
diff --git a/tests/box2d/Benchmark.cpp b/tests/box2d/Benchmark.cpp
index 4fd79651..6c9b3c5b 100644
--- a/tests/box2d/Benchmark.cpp
+++ b/tests/box2d/Benchmark.cpp
@@ -25,7 +25,7 @@ typedef struct {
#include <time.h>
#include <math.h>
-#if EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
#include <emscripten.h>
#endif
@@ -131,7 +131,7 @@ int main(int argc, char **argv) {
world->Step(1.0f/60.0f, 3, 3);
}
-#if EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
responsive_main_loop = argc > 2 ? argv[2][0] - '0' : 0;
if (responsive_main_loop) {
printf("responsive main loop\n");
@@ -141,7 +141,7 @@ int main(int argc, char **argv) {
do {
iter();
} while (frameCounter <= FRAMES);
-#if EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
}
#endif
@@ -173,7 +173,7 @@ void iter() {
printf("frame averages: %.3f +- %.3f, range: %.3f to %.3f \n", result.mean, result.stddev, float(minn)/CLOCKS_PER_SEC * 1000, float(maxx)/CLOCKS_PER_SEC * 1000);
-#if EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
emscripten_run_script("if (Module.reportCompletion) Module.reportCompletion()");
if (responsive_main_loop) emscripten_cancel_main_loop();
#endif
diff --git a/tests/cube_explosion.c b/tests/cube_explosion.c
index 0c6eb674..a899f068 100644
--- a/tests/cube_explosion.c
+++ b/tests/cube_explosion.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
glDeleteTextures(1, &texture);
assert(!glIsTexture(texture)); // but not anymore
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom.c b/tests/cubegeom.c
index e749045b..950439ec 100644
--- a/tests/cubegeom.c
+++ b/tests/cubegeom.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -316,7 +316,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_color.c b/tests/cubegeom_color.c
index ff30e1a9..0d2b6ecb 100644
--- a/tests/cubegeom_color.c
+++ b/tests/cubegeom_color.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -38,7 +38,7 @@ void verify() {
for (int x = 0; x < width*height*4; x++) {
if (x % 4 != 3) sum += x * data[x];
}
-#if EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
int result = sum;
REPORT_RESULT();
#endif
@@ -286,7 +286,7 @@ int main(int argc, char *argv[])
verify();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_color2.c b/tests/cubegeom_color2.c
index 76d71d00..76bbb119 100644
--- a/tests/cubegeom_color2.c
+++ b/tests/cubegeom_color2.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_fog.c b/tests/cubegeom_fog.c
index cae6ca2d..50d2843b 100644
--- a/tests/cubegeom_fog.c
+++ b/tests/cubegeom_fog.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_glew.c b/tests/cubegeom_glew.c
index 210e1c60..96f401c6 100644
--- a/tests/cubegeom_glew.c
+++ b/tests/cubegeom_glew.c
@@ -287,7 +287,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_mt.c b/tests/cubegeom_mt.c
index b4ad28a7..cbfcbfdf 100644
--- a/tests/cubegeom_mt.c
+++ b/tests/cubegeom_mt.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -274,7 +274,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_normal.c b/tests/cubegeom_normal.c
index 02655edf..e56286fb 100644
--- a/tests/cubegeom_normal.c
+++ b/tests/cubegeom_normal.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_normal_dap.c b/tests/cubegeom_normal_dap.c
index 752911a8..594aec05 100644
--- a/tests/cubegeom_normal_dap.c
+++ b/tests/cubegeom_normal_dap.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_normal_dap_far.c b/tests/cubegeom_normal_dap_far.c
index 35a068d9..da28f775 100644
--- a/tests/cubegeom_normal_dap_far.c
+++ b/tests/cubegeom_normal_dap_far.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#if !defined(__EMSCRIPTEN__)
#define USE_GLEW 1
#endif
@@ -263,7 +263,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#if !defined(__EMSCRIPTEN__)
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_normal_dap_far_glda.c b/tests/cubegeom_normal_dap_far_glda.c
index 849245b8..ee381458 100644
--- a/tests/cubegeom_normal_dap_far_glda.c
+++ b/tests/cubegeom_normal_dap_far_glda.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_normal_dap_far_glda_quad.c b/tests/cubegeom_normal_dap_far_glda_quad.c
index 93c157a4..91f60031 100644
--- a/tests/cubegeom_normal_dap_far_glda_quad.c
+++ b/tests/cubegeom_normal_dap_far_glda_quad.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_normal_dap_far_range.c b/tests/cubegeom_normal_dap_far_range.c
index 17691ce9..3f041668 100644
--- a/tests/cubegeom_normal_dap_far_range.c
+++ b/tests/cubegeom_normal_dap_far_range.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -263,7 +263,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_pre.c b/tests/cubegeom_pre.c
index 40b03cf7..70e3435f 100644
--- a/tests/cubegeom_pre.c
+++ b/tests/cubegeom_pre.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -283,7 +283,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_pre2.c b/tests/cubegeom_pre2.c
index df04ae31..88c82541 100644
--- a/tests/cubegeom_pre2.c
+++ b/tests/cubegeom_pre2.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THIS SOFTWARE.
*/
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
#define USE_GLEW 1
#endif
@@ -322,7 +322,7 @@ int main(int argc, char *argv[])
SDL_GL_SwapBuffers();
-#if !EMSCRIPTEN
+#ifndef __EMSCRIPTEN__
SDL_Delay(1500);
#endif
diff --git a/tests/cubegeom_pre2_vao.c b/tests/cubegeom_pre2_vao.c
index 733c8fc6..5abe1868 100644
--- a/tests/cubegeom_pre2_vao.c
+++ b/tests/cubegeom_pre2_vao.c
@@ -12,7 +12,7 @@ RESULTING FROM THE USE, MODIFICATION, OR
REDISTRIBUTION OF THI