wip

spec/build_tests_spec.rb

@@ -3100,11 +3100,37 @@ EOF
       expect(result.status).to_not eq 0
     end
 
-    it "raises an error when with_variants is called with an empty variant group" do
+    it "allows specifying the exact enabled variants on the command line 1" do
       test_dir "variants"
-      result = run_rscons(args: %w[-f error_with_variants_with_empty_variant_group.rb])
-      expect(result.stderr).to match %r{Error: empty variant group found}
-      expect(result.status).to_not eq 0
+      result = run_rscons(args: %w[-v -f multiple_groups.rb -e kde,debug])
+      expect(result.stderr).to eq ""
+      expect(result.status).to eq 0
+      expect(File.exist?("build/prog-kde-debug/prog.exe")).to be_truthy
+      expect(File.exist?("build/prog-kde-release/prog.exe")).to be_falsey
+      expect(File.exist?("build/prog-gnome-debug/prog.exe")).to be_falsey
+      expect(File.exist?("build/prog-gnome-release/prog.exe")).to be_falsey
+    end
+
+    it "allows specifying the exact enabled variants on the command line 2" do
+      test_dir "variants"
+      result = run_rscons(args: %w[-v -f multiple_groups.rb -e kde,gnome,release])
+      expect(result.stderr).to eq ""
+      expect(result.status).to eq 0
+      expect(File.exist?("build/prog-kde-debug/prog.exe")).to be_falsey
+      expect(File.exist?("build/prog-kde-release/prog.exe")).to be_truthy
+      expect(File.exist?("build/prog-gnome-debug/prog.exe")).to be_falsey
+      expect(File.exist?("build/prog-gnome-release/prog.exe")).to be_truthy
+    end
+
+    it "allows disabling a single variant on the command line" do
+      test_dir "variants"
+      result = run_rscons(args: %w[-v -f multiple_groups.rb --variants=-kde])
+      expect(result.stderr).to eq ""
+      expect(result.status).to eq 0
+      expect(File.exist?("build/prog-kde-debug/prog.exe")).to be_falsey
+      expect(File.exist?("build/prog-kde-release/prog.exe")).to be_falsey
+      expect(File.exist?("build/prog-gnome-debug/prog.exe")).to be_truthy
+      expect(File.exist?("build/prog-gnome-release/prog.exe")).to be_truthy
     end
   end