NonSFI Mode: Make hello_world test run with nonsfi_nacl=1 bitcode=1 pnacl_generate_pexe=0.

tests/pnacl_native_objects/nacl.scons

Index: tests/pnacl_native_objects/nacl.scons
diff --git a/tests/pnacl_native_objects/nacl.scons b/tests/pnacl_native_objects/nacl.scons
index 4741837376f8fc7446f578191fba68247ee93718..b4daf497214da1b397bf954266fb53c47288760a 100644
--- a/tests/pnacl_native_objects/nacl.scons
+++ b/tests/pnacl_native_objects/nacl.scons
@@ -1,3 +1,4 @@
+# -*- python -*-
 # Copyright (c) 2013 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -8,6 +9,10 @@ Import('env')
 if not env.Bit('bitcode') or env.Bit('pnacl_generate_pexe'):
   Return()
 
+# TODO(uekawa): Fix this test for Non-SFI mode.
+if env.Bit('nonsfi_nacl'):

[Mark Seaborn, 2014/09/26 01:31:07]

It's not nonsfi_nacl=1 that causes this file to fail.  It's
"--mode=dbg-host,nacl,nacl_irt_test pnacl_generate_pexe=0".

So it would be more appropriate to write:

# This file fails with "--mode=dbg-host,nacl,nacl_irt_test
# pnacl_generate_pexe=0", so disable it for that case.
# TODO(uekawa): Investigate why this fails in that case and re-enable.
if env.Bit('tests_use_irt'):
  Return()

(The cause is probably something to do with this file's use of library paths and
Replicate().)

Actually, a simpler fix is to modify SConstruct to move this nacl.scons file
from irt_variant_tests to nonvariant_tests.

[Junichi Uekawa, 2014/09/26 01:59:50]

hmm.. I see this is not just nonsfi nacl that breaks.
updated the comment here.

+  Return()
+
 tests = []
 bc_env = env.Clone()
 bc_env.Replace(CCFLAGS=[], LINKFLAGS=[])