De-duplicate ppapi_sources.gypi's test file lists

List files in 'test_common_source_files' instead of listing them in
both 'test_nacl_source_files' and 'test_trusted_source_files'.

This makes it more obvious which tests are not yet enabled for NaCl.

Note that test_memory.cc was listed twice in the NaCl section, and
tests/test_mouse_cursor.h was missing from the trusted section.

BUG=none
TEST=trybots

Review URL: https://chromiumcodereview.appspot.com/10257017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134510 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 38 insertions, 57 deletions

diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi
index 6f45f2c..4a9c8d7 100644
--- a/ppapi/ppapi_sources.gypi
+++ b/ppapi/ppapi_sources.gypi
@@ -312,21 +312,59 @@
       'tests/arch_dependent_sizes_32.h',
       'tests/arch_dependent_sizes_64.h',
       'tests/pp_thread.h',
+      'tests/test_audio_config.cc',
+      'tests/test_audio_config.h',
       'tests/test_case.cc',
       'tests/test_case.h',
+      'tests/test_cursor_control.cc',
+      'tests/test_cursor_control.h',
+      'tests/test_directory_reader.cc',
+      'tests/test_directory_reader.h',
       'tests/test_empty.cc',
       'tests/test_empty.h',
+      'tests/test_file_io.cc',
+      'tests/test_file_io.h',
+      'tests/test_file_ref.cc',
+      'tests/test_file_ref.h',
+      'tests/test_file_system.cc',
+      'tests/test_file_system.h',
+      'tests/test_graphics_2d.cc',
+      'tests/test_graphics_2d.h',
       'tests/test_host_resolver_private.cc',
       'tests/test_host_resolver_private.h',
+      'tests/test_image_data.cc',
+      'tests/test_image_data.h',
+      'tests/test_input_event.cc',
+      'tests/test_input_event.h',
+      'tests/test_memory.cc',
+      'tests/test_memory.h',
+      'tests/test_mouse_cursor.cc',
+      'tests/test_mouse_cursor.h',
       'tests/test_net_address_private_untrusted.cc',
       'tests/test_net_address_private_untrusted.h',
+      'tests/test_paint_aggregator.cc',
+      'tests/test_paint_aggregator.h',
+      'tests/test_post_message.cc',
+      'tests/test_post_message.h',
+      'tests/test_scrollbar.cc',
+      'tests/test_scrollbar.h',
       'tests/test_tcp_server_socket_private.cc',
       'tests/test_tcp_server_socket_private.h',
       'tests/test_tcp_socket_private.cc',
       'tests/test_tcp_socket_private.h',
       'tests/test_udp_socket_private.cc',
       'tests/test_udp_socket_private.h',
+      'tests/test_url_loader.cc',
+      'tests/test_url_loader.h',
+      'tests/test_url_request.cc',
+      'tests/test_url_request.h',
       'tests/test_utils.cc',
+      'tests/test_var.cc',
+      'tests/test_var.h',
+      'tests/test_view.cc',
+      'tests/test_view.h',
+      'tests/test_websocket.cc',
+      'tests/test_websocket.h',
       'tests/testing_instance.cc',
       'tests/testing_instance.h',
 
@@ -340,29 +378,9 @@
     #
     'test_nacl_source_files': [
       # Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER)
-      'tests/test_audio_config.cc',
-      'tests/test_cursor_control.cc',
-      'tests/test_directory_reader.cc',
-      'tests/test_file_io.cc',
-      'tests/test_file_ref.cc',
-      'tests/test_file_system.cc',
-      'tests/test_input_event.cc',
-      'tests/test_memory.cc',
-      'tests/test_graphics_2d.cc',
-      'tests/test_image_data.cc',
-      'tests/test_memory.cc',
-      'tests/test_mouse_cursor.cc',
-      'tests/test_paint_aggregator.cc',
-      'tests/test_post_message.cc',
-      'tests/test_scrollbar.cc',
       'tests/test_tcp_server_socket_private_disallowed.cc',
       'tests/test_tcp_socket_private_disallowed.cc',
       'tests/test_udp_socket_private_disallowed.cc',
-      'tests/test_url_loader.cc',
-      'tests/test_url_request.cc',
-      'tests/test_var.cc',
-      'tests/test_view.cc',
-      'tests/test_websocket.cc',
     ],
     #
     # Sources used in trusted tests.
@@ -371,8 +389,6 @@
       # Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER)
       'tests/test_audio.cc',
       'tests/test_audio.h',
-      'tests/test_audio_config.cc',
-      'tests/test_audio_config.h',
       'tests/test_broker.cc',
       'tests/test_broker.h',
       'tests/test_browser_font.cc',
@@ -387,16 +403,6 @@
       'tests/test_cpp_includes.cc',
       'tests/test_crypto.cc',
       'tests/test_crypto.h',
-      'tests/test_cursor_control.cc',
-      'tests/test_cursor_control.h',
-      'tests/test_directory_reader.cc',
-      'tests/test_directory_reader.h',
-      'tests/test_file_io.cc',
-      'tests/test_file_io.h',
-      'tests/test_file_ref.cc',
-      'tests/test_file_ref.h',
-      'tests/test_file_system.cc',
-      'tests/test_file_system.h',
       'tests/test_flash.cc',
       'tests/test_flash.h',
       'tests/test_flash_clipboard.cc',
@@ -407,50 +413,25 @@
       'tests/test_flash_message_loop.h',
       'tests/test_fullscreen.cc',
       'tests/test_fullscreen.h',
-      'tests/test_graphics_2d.cc',
-      'tests/test_graphics_2d.h',
       'tests/test_graphics_3d.cc',
       'tests/test_graphics_3d.h',
-      'tests/test_image_data.cc',
-      'tests/test_image_data.h',
-      'tests/test_input_event.cc',
-      'tests/test_input_event.h',
-      'tests/test_memory.cc',
-      'tests/test_memory.h',
-      'tests/test_mouse_cursor.cc',
       'tests/test_net_address_private.cc',
       'tests/test_net_address_private.h',
       'tests/test_network_monitor_private.cc',
       'tests/test_network_monitor_private.h',
-      'tests/test_paint_aggregator.cc',
-      'tests/test_paint_aggregator.h',
-      'tests/test_post_message.cc',
-      'tests/test_post_message.h',
       'tests/test_resource_array.cc',
       'tests/test_resource_array.h',
-      'tests/test_scrollbar.cc',
-      'tests/test_scrollbar.h',
       'tests/test_struct_sizes.c',
       'tests/test_tcp_socket_private_trusted.cc',
       'tests/test_tcp_socket_private_trusted.h',
       'tests/test_uma.cc',
       'tests/test_uma.h',
-      'tests/test_url_loader.cc',
-      'tests/test_url_loader.h',
-      'tests/test_url_request.cc',
-      'tests/test_url_request.h',
       'tests/test_url_util.cc',
       'tests/test_url_util.h',
       'tests/test_utils.cc',
       'tests/test_utils.h',
-      'tests/test_var.cc',
-      'tests/test_var.h',
-      'tests/test_view.cc',
-      'tests/test_view.h',
       'tests/test_video_decoder.cc',
       'tests/test_video_decoder.h',
-      'tests/test_websocket.cc',
-      'tests/test_websocket.h',
       'tests/test_x509_certificate_private.cc',
       'tests/test_x509_certificate_private.h',