[Notes] [Git][BuildStream/buildstream][willsalmon/simpleOutSource] test if i brake

[Will Salmon <gitlab mg gitlab com>]

Title: GitLab

Will Salmon pushed to branch willsalmon/simpleOutSource at BuildStream / buildstream

Commits:

• fd778be0
  by William Salmon at 2018-09-19T14:29:57Z

  test if i brake
  

2 changed files:

• buildstream/data/projectconfig.yaml
• tests/format/variables.py

Changes:

buildstream/data/projectconfig.yaml

---

...	...	@@ -39,7 +39,7 @@ variables:
39	39	build-root: /buildstream/%{project-name}/%{element-name}
40	40
41	41	# Indicates where the build system should look for configuration files
42		- conf-root: ./
	42	+ conf-root: .
43	43
44	44	# Indicates the build installation directory in the sandbox
45	45	install-root: /buildstream-install
...	...	@@ -194,4 +194,4 @@ shell:
194	194	command: [ 'sh', '-i' ]
195	195
196	196	remote-execution:
197		- url: ""
		\ No newline at end of file
	197	+ url: ""

tests/format/variables.py

---

...	...	@@ -19,7 +19,7 @@ DATA_DIR = os.path.join(
19	19	@pytest.mark.parametrize("target,varname,expected", [
20	20	('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/buildstream-install\" install"),
21	21	('cmake.bst', 'cmake',
22		- "cmake -B_builddir -H\"./\" -G\"Unix Makefiles\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" +
	22	+ "cmake -B_builddir -H\".\" -G\"Unix Makefiles\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" +
23	23	"-DCMAKE_INSTALL_LIBDIR=lib "),
24	24	('distutils.bst', 'python-install',
25	25	"python3 setup.py install --prefix \"/usr\" \\\n" +
...	...	@@ -45,7 +45,7 @@ def test_defaults(cli, datafiles, tmpdir, target, varname, expected):
45	45	@pytest.mark.parametrize("target,varname,expected", [
46	46	('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/custom/install/root\" install"),
47	47	('cmake.bst', 'cmake',
48		- "cmake -B_builddir -H\"./\" -G\"Ninja\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" +
	48	+ "cmake -B_builddir -H\".\" -G\"Ninja\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" +
49	49	"-DCMAKE_INSTALL_LIBDIR=lib "),
50	50	('distutils.bst', 'python-install',
51	51	"python3 setup.py install --prefix \"/opt\" \\\n" +

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.