| OLD | NEW |
|---|
| 1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 self._assertOptimization({ | 159 self._assertOptimization({ |
| 160 'platform/mac': '1', | 160 'platform/mac': '1', |
| 161 'platform/win': '2', | 161 'platform/win': '2', |
| 162 }, { | 162 }, { |
| 163 'platform/mac': '1', | 163 'platform/mac': '1', |
| 164 'platform/win': '2', | 164 'platform/win': '2', |
| 165 }) | 165 }) |
| 166 | 166 |
| 167 def test_virtual_root_redundant_with_actual_root(self): | 167 def test_virtual_root_redundant_with_actual_root(self): |
| 168 self._assertOptimization({ | 168 self._assertOptimization({ |
| 169 'virtual/softwarecompositing': '2', | 169 'virtual/software/compositing': '2', |
| 170 'compositing': '2', | 170 'compositing': '2', |
| 171 }, { | 171 }, { |
| 172 'virtual/softwarecompositing': None, | 172 'virtual/software/compositing': None, |
| 173 'compositing': '2', | 173 'compositing': '2', |
| 174 }, baseline_dirname='virtual/softwarecompositing') | 174 }, baseline_dirname='virtual/software/compositing') |
| 175 | 175 |
| 176 def test_virtual_root_redundant_with_ancestors(self): | 176 def test_virtual_root_redundant_with_ancestors(self): |
| 177 self._assertOptimization({ | 177 self._assertOptimization({ |
| 178 'virtual/softwarecompositing': '2', | 178 'virtual/software/compositing': '2', |
| 179 'platform/mac/compositing': '2', | 179 'platform/mac/compositing': '2', |
| 180 'platform/win/compositing': '2', | 180 'platform/win/compositing': '2', |
| 181 }, { | 181 }, { |
| 182 'virtual/softwarecompositing': None, | 182 'virtual/software/compositing': None, |
| 183 'compositing': '2', | 183 'compositing': '2', |
| 184 }, baseline_dirname='virtual/softwarecompositing') | 184 }, baseline_dirname='virtual/software/compositing') |
| 185 | 185 |
| 186 def test_virtual_root_not_redundant_with_ancestors(self): | 186 def test_virtual_root_not_redundant_with_ancestors(self): |
| 187 self._assertOptimization({ | 187 self._assertOptimization({ |
| 188 'virtual/softwarecompositing': '2', | 188 'virtual/software/compositing': '2', |
| 189 'platform/mac/compositing': '1', | 189 'platform/mac/compositing': '1', |
| 190 }, { | 190 }, { |
| 191 'virtual/softwarecompositing': '2', | 191 'virtual/software/compositing': '2', |
| 192 'platform/mac/compositing': '1', | 192 'platform/mac/compositing': '1', |
| 193 }, baseline_dirname='virtual/softwarecompositing') | 193 }, baseline_dirname='virtual/software/compositing') |
| OLD | NEW |
|---|
Chromium Code Reviews
