Update test_uuid. NFC (#21060)

- Split into an other test and a browser test.
- Give it a standard filename
- Use assertContains
- Use do_runf helper

Author: sbc100

test/test_browser.py

@@ -2666,29 +2666,7 @@ def test_cpuprofiler_memoryprofiler(self, opts):
     self.btest_exit('hello_world_gles.c', args=['-DLONGTEST=1', '-DTEST_MEMORYPROFILER_ALLOCATIONS_MAP=1', '--cpuprofiler', '--memoryprofiler', '-lGL', '-lglut', '-DANIMATE'] + opts)
 
   def test_uuid(self):
-    # Run with ./runner browser.test_uuid
-    # We run this test in Node/SPIDERMONKEY and browser environments because we try to make use of
-    # high quality crypto random number generators such as crypto.getRandomValues or randomBytes (if available).
-
-    # First run tests in Node and/or SPIDERMONKEY using self.run_js. Use closure compiler so we can check that
-    # require('crypto').randomBytes and window.crypto.getRandomValues doesn't get minified out.
-    self.run_process([EMCC, '-O2', '--closure=1', test_file('uuid/test.c'), '-o', 'test.js', '-luuid'])
-
-    test_js_closure = read_file('test.js')
-
-    # Check that test.js compiled with --closure 1 contains ").randomBytes" and "window.crypto.getRandomValues"
-    assert ").randomBytes" in test_js_closure
-    assert "window.crypto.getRandomValues" in test_js_closure
-
-    out = self.run_js('test.js')
-    print(out)
-
-    # Tidy up files that might have been created by this test.
-    delete_file(test_file('uuid/test.js'))
-    delete_file(test_file('uuid/test.js.map'))
-
-    # Now run test in browser
-    self.btest_exit('uuid/test.c', args=['-luuid'])
+    self.btest_exit('test_uuid.c', args=['-luuid'])
 
   @requires_graphics_hardware
   def test_glew(self):

test/test_other.py

@@ -14479,3 +14479,19 @@ def test_browser_too_old(self):
   def test_js_only_settings(self):
     err = self.run_process([EMCC, test_file('hello_world.c'), '-o', 'foo.wasm', '-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=emscripten_get_heap_max'], stderr=PIPE).stderr
     self.assertContained('emcc: warning: DEFAULT_LIBRARY_FUNCS_TO_INCLUDE is only valid when generating JavaScript output', err)
+
+  def test_uuid(self):
+    # We run this test in Node/SPIDERMONKEY and browser environments because we
+    # try to make use of high quality crypto random number generators such as
+    # crypto.getRandomValues or randomBytes (if available).
+
+    # Use closure compiler so we can check that require('crypto').randomBytes and
+    # window.crypto.getRandomValues doesn't get minified out.
+    self.do_runf('test_uuid.c', emcc_args=['-O2', '--closure=1', '-luuid'])
+
+    js_out = read_file('test_uuid.js')
+
+    # Check that test.js compiled with --closure 1 contains ").randomBytes" and
+    # "window.crypto.getRandomValues"
+    self.assertContained(").randomBytes", js_out)
+    self.assertContained("window.crypto.getRandomValues", js_out)

test/uuid/test.c renamed to test/test_uuid.c

@@ -9,8 +9,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <emscripten.h>
 
 int isUUID(char* p, int upper) {
     char* p1 = p;
@@ -25,7 +23,7 @@ int isUUID(char* p, int upper) {
         return 1;
     } else {
         return 0;
-    }   
+    }
 }
 
 int main() {
@@ -40,7 +38,7 @@ int main() {
     assert(uuid_variant(uuid) == UUID_VARIANT_DCE);
     assert((uuid[8] & 0xC0) == 0x80); // RFC-4122 variant marker
 
-    char *generated = (char *)malloc(37*sizeof(char));
+    char generated[37];
     uuid_unparse(uuid, generated);
     assert(isUUID(generated, 0) == 1); // Check it's a valid lower case UUID string.
     printf("\nuuid = %s\n", generated);
@@ -56,15 +54,13 @@ int main() {
     assert(isUUID(generated, 1) == 1); // Check it's a valid upper case UUID string.
     printf("uuid = %s\n", generated);
 
-
     uuid_copy(uuid2, uuid);
     assert(uuid_compare(uuid2, uuid) == 0);
 
     uuid_clear(uuid);
     assert(uuid_compare(empty_uuid, uuid) == 0);
 
     assert(uuid_is_null(uuid) == 1);
-
     return 0;
 }