From 0b07a139e9ff565aa2cf93104ca4ce7046af5ddc Mon Sep 17 00:00:00 2001 From: Alice Benatti Date: Mon, 4 May 2026 11:55:39 +0200 Subject: [PATCH 1/2] add: conflitti test --- conflitti/test.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/conflitti/test.cpp b/conflitti/test.cpp index d72c132..d96e03e 100644 --- a/conflitti/test.cpp +++ b/conflitti/test.cpp @@ -2,20 +2,14 @@ #include int main() { - if (std::system("g++ main.cpp -o adm_program") != 0) { + if (std::system("g++ mini.cpp -o adm_program.out") != 0) { std::cout << "ERR: Compilazione fallita\n"; return 1; } - if (std::system("./adm_program") != 0) { + if (std::system("./adm_program.out") != 0) { std::cout << "ERR: Errore in esecuzione\n"; return 1; } std::cout << "Test OK\n"; - - int x, y; - std::cout << "Inserisci due numeri da sommare: "; - std::cin >> x >> y; - std::cout << "La somma dei due numeri รจ: " << (x + y) << "\n"; - return 0; } \ No newline at end of file From 2df21b8c8e1e70f060046d637a1825b434e75892 Mon Sep 17 00:00:00 2001 From: Alice Benatti Date: Mon, 4 May 2026 11:56:17 +0200 Subject: [PATCH 2/2] add: conflitti time --- conflitti/test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conflitti/test.cpp b/conflitti/test.cpp index d96e03e..037da94 100644 --- a/conflitti/test.cpp +++ b/conflitti/test.cpp @@ -1,4 +1,4 @@ -#include +#include #include int main() { @@ -10,6 +10,6 @@ int main() { std::cout << "ERR: Errore in esecuzione\n"; return 1; } - std::cout << "Test OK\n"; + std::cout << "Test OK ciao\n"; return 0; -} \ No newline at end of file +}