236c236
< (category, name, _ref, isa, opsys, config) = ref_dir.split('/')
---
> (category, mode, name, _ref, isa, opsys, config) = ref_dir.split('/')
241c241
< tgt_dir = os.path.join(category, name, isa, opsys, config)
---
> tgt_dir = os.path.join(category, mode, name, isa, opsys, config)
268,290c268,289
< if env['FULL_SYSTEM']:
< if env['TARGET_ISA'] == 'alpha':
< configs += ['tsunami-simple-atomic',
< 'tsunami-simple-timing',
< 'tsunami-simple-atomic-dual',
< 'tsunami-simple-timing-dual',
< 'twosys-tsunami-simple-atomic',
< 'tsunami-o3', 'tsunami-o3-dual',
< 'tsunami-inorder']
< if env['TARGET_ISA'] == 'sparc':
< configs += ['t1000-simple-atomic',
< 't1000-simple-timing']
< if env['TARGET_ISA'] == 'arm':
< configs += ['realview-simple-atomic',
< 'realview-simple-atomic-dual',
< 'realview-simple-timing',
< 'realview-simple-timing-dual',
< 'realview-o3',
< 'realview-o3-dual']
< if env['TARGET_ISA'] == 'x86':
< configs += ['pc-simple-atomic',
< 'pc-simple-timing',
< 'pc-o3-timing']
---
> if env['TARGET_ISA'] == 'alpha':
> configs += ['tsunami-simple-atomic',
> 'tsunami-simple-timing',
> 'tsunami-simple-atomic-dual',
> 'tsunami-simple-timing-dual',
> 'twosys-tsunami-simple-atomic',
> 'tsunami-o3', 'tsunami-o3-dual',
> 'tsunami-inorder']
> if env['TARGET_ISA'] == 'sparc':
> configs += ['t1000-simple-atomic',
> 't1000-simple-timing']
> if env['TARGET_ISA'] == 'arm':
> configs += ['realview-simple-atomic',
> 'realview-simple-atomic-dual',
> 'realview-simple-timing',
> 'realview-simple-timing-dual',
> 'realview-o3',
> 'realview-o3-dual']
> if env['TARGET_ISA'] == 'x86':
> configs += ['pc-simple-atomic',
> 'pc-simple-timing',
> 'pc-o3-timing']
292,295c291,293
< else:
< configs += ['simple-atomic', 'simple-timing', 'o3-timing', 'memtest',
< 'simple-atomic-mp', 'simple-timing-mp', 'o3-timing-mp',
< 'inorder-timing', 'rubytest']
---
> configs += ['simple-atomic', 'simple-timing', 'o3-timing', 'memtest',
> 'simple-atomic-mp', 'simple-timing-mp', 'o3-timing-mp',
> 'inorder-timing', 'rubytest']
306c304
< dirs = glob.glob('*/*/ref/%s/*/%s' % (env['TARGET_ISA'], config))
---
> dirs = glob.glob('*/*/*/ref/%s/*/%s' % (env['TARGET_ISA'], config))