Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: tests/file/nacl.scons

Issue 1593024: We should not include -lnosys on ARM: it comes automatically and will spoil... (Closed) Base URL: http://nativeclient.googlecode.com/svn/trunk/src/native_client/
Patch Set: '' Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | tests/sysbasic/nacl.scons » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2008, Google Inc. 1 # Copyright 2008, Google Inc.
2 # All rights reserved. 2 # All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 29
30 30
31 Import('env') 31 Import('env')
32 32
33 33
34 env.ComponentProgram('file.nexe', 'file.cc', 34 # Don't use -lnosys on ARM - it's automagically included and will spoil
35 EXTRA_LIBS=['pthread', 'nosys']) 35 # things if included before -lc
36 if env['TARGET_ARCHITECTURE'] == arm:
37 extra_libs = ['pthread']
38 else:
39 extra_libs = ['pthread', 'nosys']
36 40
41 env.ComponentProgram('file.nexe', 'file.c', EXTRA_LIBS=extra_libs)
37 42
38 # TODO: add tests back in 43 # TODO: add tests back in
39 # NOTE: this smoke tests currently fails in "test17" 44 # NOTE: this smoke tests currently fails in "test17"
40 # when opening "././file/testdata256" 45 # when opening "././file/testdata256"
41 # it creates files in the current directory and below 46 # it creates files in the current directory and below
42 # which should be avoided 47 # which should be avoided
43 # so for now we invoke file.py (see below) 48 # so for now we invoke file.py (see below)
44 49
45 # node = env.CommandSelLdrTestNacl('file_test.out', 50 # node = env.CommandSelLdrTestNacl('file_test.out',
46 # env.File('file.nexe'), 51 # env.File('file.nexe'),
47 # flags='-d', 52 # flags='-d',
48 # ) 53 # )
49 # AlwaysBuild(node) 54 # AlwaysBuild(node)
50 # env.AddNodeToSmokeTestSuite(node) 55 # env.AddNodeToSmokeTestSuite(node)
51 56
52 57
53 # node = env.Command('file_test.out', 58 # node = env.Command('file_test.out',
54 # 'file.py', 59 # 'file.py',
55 # '${PYTHON} %s > ${TARGET}' % env.File('file.py') 60 # '${PYTHON} %s > ${TARGET}' % env.File('file.py')
56 # ) 61 # )
57 # AlwaysBuild(node) 62 # AlwaysBuild(node)
58 # env.AddNodeToSmokeTestSuite(node) 63 # env.AddNodeToSmokeTestSuite(node)
OLDNEW
« no previous file with comments | « no previous file | tests/sysbasic/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698