Commit 7035fadb authored by mball@google.com's avatar mball@google.com

Fixed set_nacl_env_test for changes to utf8 conversion in ppapi

TBR=bradnelson, noelallen

Review URL: http://codereview.chromium.org/8885015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113633 0039d316-1c4b-4281-b951-d872f2087c98
parent d77e93b3
...@@ -93,6 +93,9 @@ class TestSetNaclEnv(unittest.TestCase): ...@@ -93,6 +93,9 @@ class TestSetNaclEnv(unittest.TestCase):
src_dir = os.path.join(SCRIPT_DIR, 'set_nacl_env_test_archive') src_dir = os.path.join(SCRIPT_DIR, 'set_nacl_env_test_archive')
for file in glob.iglob(os.path.join(src_dir, '*')): for file in glob.iglob(os.path.join(src_dir, '*')):
shutil.copy2(file, self._temp_dir) shutil.copy2(file, self._temp_dir)
shutil.copy2(os.path.join(SDK_ROOT_DIR, 'examples', 'hello_world_c',
'hello_world_c.c'),
self._temp_dir)
script = os.path.join(SDK_ROOT_DIR, 'build_tools', 'sdk_tools', script = os.path.join(SDK_ROOT_DIR, 'build_tools', 'sdk_tools',
'set_nacl_env.py') 'set_nacl_env.py')
......
...@@ -10,7 +10,7 @@ all : $(EXAMPLE) ...@@ -10,7 +10,7 @@ all : $(EXAMPLE)
clean : clean :
rm -f $(EXAMPLE) hello_world_c.o hello_world_c.nexe rm -f $(EXAMPLE) hello_world_c.o hello_world_c.nexe
SRCS_ = $(EXAMPLE_DIR)/*.c SRCS_ = $(EXAMPLE_DIR)/hello_world_c.c
hello_world_c.o : $(SRCS_) hello_world_c.o : $(SRCS_)
$(CXX) $(CPPFLAGS) -I$(EXAMPLE_DIR) $(CXXFLAGS) -c \ $(CXX) $(CPPFLAGS) -I$(EXAMPLE_DIR) $(CXXFLAGS) -c \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment