equal
deleted
inserted
replaced
34 # set environment variable and remember the old value (if there is one) |
34 # set environment variable and remember the old value (if there is one) |
35 if os.environ.has_key(name): |
35 if os.environ.has_key(name): |
36 self.envStack[name] = os.environ[name] |
36 self.envStack[name] = os.environ[name] |
37 os.environ[name] = value |
37 os.environ[name] = value |
38 |
38 |
39 def isWin32(self): |
39 def isWin(self): |
40 return sys.platform.lower().startswith("win") |
40 return 'win' in raptor.hostplatform |
41 |
41 |
42 def RestoreEnv(self, name): |
42 def RestoreEnv(self, name): |
43 # put environment back to its state before SetEnv |
43 # put environment back to its state before SetEnv |
44 if self.envStack.has_key(name): |
44 if self.envStack.has_key(name): |
45 os.environ[name] = self.envStack[name] |
45 os.environ[name] = self.envStack[name] |
408 eval = aRaptor.GetEvaluator(None, toolVar.GenerateBuildUnits(aRaptor.cache)[0]) |
408 eval = aRaptor.GetEvaluator(None, toolVar.GenerateBuildUnits(aRaptor.cache)[0]) |
409 value = eval.Get("ENVVAR_TOOL_WITH_SPACES") |
409 value = eval.Get("ENVVAR_TOOL_WITH_SPACES") |
410 except Exception, e: |
410 except Exception, e: |
411 exceptionText = str(e) |
411 exceptionText = str(e) |
412 |
412 |
413 if self.isWin32(): |
413 if self.isWin(): |
414 self.assertTrue(value) |
414 self.assertTrue(value) |
415 self.assertFalse(' ' in value) |
415 self.assertFalse(' ' in value) |
416 else: |
416 else: |
417 self.assertTrue(exceptionText.startswith(invalidValueException % ("ENVVAR_TOOL_WITH_SPACES", "tool"))) |
417 self.assertTrue(exceptionText.startswith(invalidValueException % ("ENVVAR_TOOL_WITH_SPACES", "tool"))) |
418 |
418 |
422 eval = aRaptor.GetEvaluator(None, toolchainpathVar.GenerateBuildUnits(aRaptor.cache)[0]) |
422 eval = aRaptor.GetEvaluator(None, toolchainpathVar.GenerateBuildUnits(aRaptor.cache)[0]) |
423 value = eval.Get("ENVVAR_TOOLCHAINPATH_WITH_SPACES") |
423 value = eval.Get("ENVVAR_TOOLCHAINPATH_WITH_SPACES") |
424 except Exception, e: |
424 except Exception, e: |
425 exceptionText = str(e) |
425 exceptionText = str(e) |
426 |
426 |
427 if self.isWin32(): |
427 if self.isWin(): |
428 self.assertTrue(value) |
428 self.assertTrue(value) |
429 self.assertFalse(' ' in value) |
429 self.assertFalse(' ' in value) |
430 else: |
430 else: |
431 self.assertTrue(exceptionText.startswith(invalidValueException % ("ENVVAR_TOOLCHAINPATH_WITH_SPACES", "toolchainpath"))) |
431 self.assertTrue(exceptionText.startswith(invalidValueException % ("ENVVAR_TOOLCHAINPATH_WITH_SPACES", "toolchainpath"))) |
432 |
432 |