From 69f5bea2b2613855299f554ef057fdab6e4d9e8e Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sun, 28 Nov 2021 15:10:25 -0500 Subject: [PATCH] Fix specs for dependency file moving - #135 --- spec/build_tests_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/build_tests_spec.rb b/spec/build_tests_spec.rb index 7751180..650bd94 100644 --- a/spec/build_tests_spec.rb +++ b/spec/build_tests_spec.rb @@ -529,7 +529,7 @@ EOF result = run_rscons expect(result.stderr).to eq "" verify_lines(lines(result.stdout), [ - %r{gcc -c -o one.o -MMD -MF one.o.mf -DONE one.c}, + %r{gcc -c -o one.o -MMD -MF build/e.1/one.o.mf -DONE one.c}, %r{gcc -c -o build/e.1/two.c.o -MMD -MF build/e.1/two.c.o.mf two.c}, %r{gcc -o two_sources.exe one.o build/e.1/two.c.o}, ]) @@ -569,8 +569,8 @@ EOF result = run_rscons(rsconscript: "build_hooks_override_vars.rb") expect(result.stderr).to eq "" verify_lines(lines(result.stdout), [ - %r{gcc -c -o one.o -MMD -MF one.o.mf -Isrc -Isrc/one -Isrc/two -O1 src/two/two.c}, - %r{gcc -c -o two.o -MMD -MF two.o.mf -Isrc -Isrc/one -Isrc/two -O2 src/two/two.c}, + %r{gcc -c -o one.o -MMD -MF build/e.1/one.o.mf -Isrc -Isrc/one -Isrc/two -O1 src/two/two.c}, + %r{gcc -c -o two.o -MMD -MF build/e.1/two.o.mf -Isrc -Isrc/one -Isrc/two -O2 src/two/two.c}, ]) expect(File.exists?('one.o')).to be_truthy expect(File.exists?('two.o')).to be_truthy @@ -1587,7 +1587,7 @@ EOF result = run_rscons(rsconscript: "override_depfilesuffix.rb") expect(result.stderr).to eq "" verify_lines(lines(result.stdout), [ - %r{gcc -c -o simple.o -MMD -MF simple.o.deppy simple.c}, + %r{gcc -c -o simple.o -MMD -MF build/e.1/simple.o.deppy simple.c}, ]) end