tests/cachekey/project/sources/patch2.expected

-b884e246b61cc930f33216055e99a82a47dcf42435b860622039555a159fc255
\ No newline at end of file
+5e91946c032a83120ae97a84f96dbfbf98992d6decff99df0073a117cd45702e
\ No newline at end of file

tests/cachekey/project/sources/patch3.expected

-79e297df970b6faaa1cfd64e5a6b6c8b4611b9128a19a7f22a2ee051174fccc9
\ No newline at end of file
+bd55bfb2b546b57ac627ba7756269e5d64cb7a74c990e0ef66c06bd4dc3b44a3
\ No newline at end of file

tests/cachekey/project/sources/pip1.expected

-d8bdc8848e4d2e3d70a1267e73bf0e63afa778e4c905cad1a94308634176fb87
\ No newline at end of file
+09d873158f35ea64e67919373a6cfbd4aaba9321b817c89317b1350da8267318
\ No newline at end of file

tests/cachekey/project/sources/remote1.expected

-2ab4d2a2490dabafadfc44d95b78f690105e0f0d1cb58665a6a332920172741e
\ No newline at end of file
+fc9d09695a6e04785671cc53e36dbc1dd1391a8bcd4a7003c5cce161f2a6c484
\ No newline at end of file

tests/cachekey/project/sources/remote2.expected

-642cbafb3020ab80dae274a983ade81757cf3a1fa4fbba01f621599830be50fd
\ No newline at end of file
+de35773c4cec65912e4cef18682a0fc176a49ee6637b0c5e8f68b546225c0865
\ No newline at end of file

tests/cachekey/project/sources/tar1.expected

-d32bf753f0507f07c8b660ed8fc4428434faf7d07049de92ee203256db0149a3
\ No newline at end of file
+9e2e12cb32b52463fd324afe2f32b622ee76973cdefcb35e0a14c8d0ecf94604
\ No newline at end of file

tests/cachekey/project/sources/tar2.expected

-41844c597dbffb4f3dcfaae2e5553836816b1b77744db01e47671ab14276795a
\ No newline at end of file
+08b95e17d08ac792e04df9d8165a00ee11520f022895cc6abafe379295a55fc3
\ No newline at end of file

tests/cachekey/project/sources/zip1.expected

-a68328d4ad389a4cdc690103bc6b0bb4d2252eb4f738f6cd004645eb478fcf41
\ No newline at end of file
+590963540c16c9c462fbbed88d1c6bf9134e753c652e01710b81d6218bf348bb
\ No newline at end of file

tests/cachekey/project/sources/zip2.expected

-30c104c539200d568f9157549dd3c8a15a157cb5c56632638b99986e4edf0576
\ No newline at end of file
+97dc236aa4f600cfbe6f5d7d47841f547ac6c6ee0e6b55275af8d3f1ec2cb68a
\ No newline at end of file

tests/cachekey/project/target.bst

@@ -7,6 +7,7 @@ depends:
 - sources/bzr1.bst
 - sources/git1.bst
 - sources/git2.bst
+- sources/git3.bst
 - sources/local1.bst
 - sources/local2.bst
 - sources/ostree1.bst

tests/cachekey/project/target.expected

-125d9e7dcf4f49e5f80d85b7f144b43ed43186064afc2e596e57f26cce679cf5
\ No newline at end of file
+92dae6a712b4f91f4fdbdf8dad732cf07ff4da092a319fa4f4b261a9287640de

tests/completions/completions.py

@@ -6,6 +6,7 @@ from tests.testutils import cli
 DATA_DIR = os.path.dirname(os.path.realpath(__file__))
 
 MAIN_COMMANDS = [
+    'artifact ',
     'build ',
     'checkout ',
     'fetch ',

tests/examples/autotools.py

@@ -13,8 +13,8 @@ DATA_DIR = os.path.join(
 
 
 # Tests a build of the autotools amhello project on a alpine-linux base runtime
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_build(cli, tmpdir, datafiles):
@@ -29,17 +29,15 @@ def test_autotools_build(cli, tmpdir, datafiles):
     result.assert_success()
 
     assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
-                               '/usr/share', '/usr/lib/debug',
-                               '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
-                               '/usr/lib/debug/usr/bin/hello',
+                               '/usr/share',
                                '/usr/bin/hello',
                                '/usr/share/doc', '/usr/share/doc/amhello',
                                '/usr/share/doc/amhello/README'])
 
 
 # Test running an executable built with autotools.
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_run(cli, tmpdir, datafiles):

tests/examples/developing.py

@@ -14,8 +14,8 @@ DATA_DIR = os.path.join(
 
 
 # Test that the project builds successfully
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_build(cli, tmpdir, datafiles):
@@ -30,15 +30,13 @@ def test_autotools_build(cli, tmpdir, datafiles):
     result.assert_success()
 
     assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
-                               '/usr/share', '/usr/lib/debug',
-                               '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
-                               '/usr/lib/debug/usr/bin/hello',
+                               '/usr/share',
                                '/usr/bin/hello'])
 
 
 # Test the unmodified hello command works as expected.
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_run_unmodified_hello(cli, tmpdir, datafiles):
@@ -70,8 +68,8 @@ def test_open_workspace(cli, tmpdir, datafiles):
 
 
 # Test making a change using the workspace
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_make_change_in_workspace(cli, tmpdir, datafiles):

tests/examples/flatpak-autotools.py

@@ -32,8 +32,8 @@ def workaround_setuptools_bug(project):
 
 # Test that a build upon flatpak runtime 'works' - we use the autotools sample
 # amhello project for this.
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE, reason='Only available on linux with ostree')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_build(cli, tmpdir, datafiles):
@@ -48,17 +48,15 @@ def test_autotools_build(cli, tmpdir, datafiles):
     assert result.exit_code == 0
 
     assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
-                               '/usr/share', '/usr/lib/debug',
-                               '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
-                               '/usr/lib/debug/usr/bin/hello',
+                               '/usr/share',
                                '/usr/bin/hello', '/usr/share/doc',
                                '/usr/share/doc/amhello',
                                '/usr/share/doc/amhello/README'])
 
 
 # Test running an executable built with autotools
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE, reason='Only available on linux with ostree')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_run(cli, tmpdir, datafiles):

tests/examples/integration-commands.py

@@ -12,8 +12,8 @@ DATA_DIR = os.path.join(
 )
 
 
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_integration_commands_build(cli, tmpdir, datafiles):
@@ -25,8 +25,8 @@ def test_integration_commands_build(cli, tmpdir, datafiles):
 
 
 # Test running the executable
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_integration_commands_run(cli, tmpdir, datafiles):

tests/examples/junctions.py

@@ -13,8 +13,8 @@ DATA_DIR = os.path.join(
 
 
 # Test that the project builds successfully
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_build(cli, tmpdir, datafiles):
@@ -25,8 +25,8 @@ def test_build(cli, tmpdir, datafiles):
 
 
 # Test the callHello script works as expected.
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_shell_call_hello(cli, tmpdir, datafiles):

tests/examples/running-commands.py

@@ -12,8 +12,8 @@ DATA_DIR = os.path.join(
 )
 
 
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_running_commands_build(cli, tmpdir, datafiles):
@@ -25,8 +25,8 @@ def test_running_commands_build(cli, tmpdir, datafiles):
 
 
 # Test running the executable
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_running_commands_run(cli, tmpdir, datafiles):

tests/format/list-directive-type-error/project.conf

@@ -4,4 +4,4 @@ options:
   arch:
     type: arch
     description: Example architecture option
-    values: [ x86_32, x86_64, aarch64 ]
+    values: [ x86-32, x86-64, aarch64 ]
\ No newline at end of file

tests/format/option-arch/element.bst

@@ -2,7 +2,7 @@ kind: autotools
 variables:
   result: "Nothing"
   (?):
-  - machine_arch == "arm":
+  - machine_arch == "aarch32":
       result: "Army"
   - machine_arch == "aarch64":
       result: "Aarchy"